X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Finterfaces%2Fresolver%2Fcontroller%2Fclass_ControllerResolver.php;h=99777c04cd81dd98ae9e32fcecc87e460d7a8551;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hp=ff5e984badf378f7b25c66fd1765825e9bd42466;hpb=78a010fef84895720e796842208f01dfb619c332;p=core.git

diff --git a/framework/main/interfaces/resolver/controller/class_ControllerResolver.php b/framework/main/interfaces/resolver/controller/class_ControllerResolver.php
index ff5e984b..99777c04 100644
--- a/framework/main/interfaces/resolver/controller/class_ControllerResolver.php
+++ b/framework/main/interfaces/resolver/controller/class_ControllerResolver.php
@@ -1,17 +1,21 @@
 <?php
 // Own namespace
-namespace CoreFramework\Resolver\Controller;
+namespace Org\Mxchange\CoreFramework\Resolver\Controller;
 
 // Import framework stuff
-use CoreFramework\Resolver\Controller\ControllerResolver;
-use CoreFramework\Resolver\Resolver;
+use Org\Mxchange\CoreFramework\Resolver\Controller\ControllerResolver;
+use Org\Mxchange\CoreFramework\Resolver\Resolver;
 
 /**
  * An instance for controller resolver classes
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/interfaces/resolver/controller/class_ControllerResolver.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/interfaces/resolver/controller/class_ControllerResolver.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *