Some updates:

[core.git] / framework / main / interfaces / resolver / actions / class_ActionResolver.php

diff --git a/framework/main/interfaces/resolver/actions/class_ActionResolver.php b/framework/main/interfaces/resolver/actions/class_ActionResolver.php
index 8fa02662562cf1bce57e34db63e248231e11833f..3af3fe2273df66ae0160fc5fba5b9e53db078da2 100644 (file)
--- a/framework/main/interfaces/resolver/actions/class_ActionResolver.php
+++ b/framework/main/interfaces/resolver/actions/class_ActionResolver.php
@@ -1,17 +1,21 @@
 <?php
 // Own namespace
-namespace CoreFramework\Resolver\Action;
+namespace Org\Mxchange\CoreFramework\Resolver\Action;
 
 // Import framework stuff
-use CoreFramework\Request\Requestable;
-use CoreFramework\Resolver\Resolver;
+use Org\Mxchange\CoreFramework\Request\Requestable;
+use Org\Mxchange\CoreFramework\Resolver\Resolver;
 
 /**
  * An instance for action resolver classes
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/resolver/actions/class_ActionResolver.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/actions/class_ActionResolver.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *