X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fexceptions%2Fcontroller%2Fclass_DefaultControllerException.php;h=3163c0b8dc9c350b379cb41265355adda1901459;hp=7a247d30c3a7682b7f0e7d82eefd3f8525198c34;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hpb=1daff5a94de037022058d8760a06bd869de67630

diff --git a/framework/main/exceptions/controller/class_DefaultControllerException.php b/framework/main/exceptions/controller/class_DefaultControllerException.php
index 7a247d30..3163c0b8 100644
--- a/framework/main/exceptions/controller/class_DefaultControllerException.php
+++ b/framework/main/exceptions/controller/class_DefaultControllerException.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Resolver\Controller\ControllerResolver;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/exceptions/controller/class_DefaultControllerException.php
  * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/exceptions/controller/class_DefaultControllerException.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *