X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fcommands%2Fhtml%2Fclass_HtmlLogoutCommand.php;h=38624b10ce2dd08398ae68f65899c41ea57c4599;hb=6e770c26c13f7b06bfc3f9b565b22f6607c5755e;hp=b8471401e2b320dc6662d1e41366389a0cbcb7ce;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;p=core.git

diff --git a/framework/main/classes/commands/html/class_HtmlLogoutCommand.php b/framework/main/classes/commands/html/class_HtmlLogoutCommand.php
index b8471401..38624b10 100644
--- a/framework/main/classes/commands/html/class_HtmlLogoutCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlLogoutCommand.php
@@ -7,7 +7,7 @@ use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -17,11 +17,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlLogoutCommand.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/commands/html/class_HtmlLogoutCommand.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *