Some updates:

[core.git] / framework / main / classes / controller / html / class_HtmlRegisterController.php

diff --git a/framework/main/classes/controller/html/class_HtmlRegisterController.php b/framework/main/classes/controller/html/class_HtmlRegisterController.php
index 3b63a48c742d7668a15305fe91ef706264e39654..64d289a8e315736bb6e94f5442856a893615d37f 100644 (file)
--- a/framework/main/classes/controller/html/class_HtmlRegisterController.php
+++ b/framework/main/classes/controller/html/class_HtmlRegisterController.php
@@ -1,20 +1,24 @@
 <?php
 // Own namespace
-namespace CoreFramework\Controller\Register;
+namespace Org\Mxchange\CoreFramework\Controller\Register;
 
 // Import framework stuff
-use CoreFramework\Controller\BaseController;
-use CoreFramework\Controller\Controller;
-use CoreFramework\Request\Requestable;
-use CoreFramework\Resolver\Command\CommandResolver;
-use CoreFramework\Response\Responseable;
+use Org\Mxchange\CoreFramework\Controller\BaseController;
+use Org\Mxchange\CoreFramework\Controller\Controller;
+use Org\Mxchange\CoreFramework\Request\Requestable;
+use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
+use Org\Mxchange\CoreFramework\Response\Responseable;
 
 /**
  * Controller for register form
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/controller/html/class_HtmlRegisterController.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/classes/controller/html/class_HtmlRegisterController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *