X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fcontroller%2Fhtml%2Fclass_HtmlLogoutController.php;h=6bb41cd5634f69edf95417a44a71b61ad4e3a49e;hb=2218902056efcf9a2c66fe7c24995e066bd7cd11;hp=4d2c7822665b46a3fafd06d018621a9615326c75;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;p=core.git

diff --git a/framework/main/classes/controller/html/class_HtmlLogoutController.php b/framework/main/classes/controller/html/class_HtmlLogoutController.php
index 4d2c7822..6bb41cd5 100644
--- a/framework/main/classes/controller/html/class_HtmlLogoutController.php
+++ b/framework/main/classes/controller/html/class_HtmlLogoutController.php
@@ -5,7 +5,7 @@ namespace Org\Mxchange\CoreFramework\Controller\Logout;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Controller\BaseController;
 use Org\Mxchange\CoreFramework\Controller\Controller;
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -15,11 +15,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/classes/controller/html/class_HtmlLogoutController.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_HtmlLogoutController.php
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2020 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  * @todo		This controller shall still provide some headlines for sidebars