Renamed Registry -> GenericRegistry to make it clear that this registry does

[core.git] / framework / main / classes / commands / html / class_HtmlProblemCommand.php

diff --git a/framework/main/classes/commands/html/class_HtmlProblemCommand.php b/framework/main/classes/commands/html/class_HtmlProblemCommand.php
index 0abf7e2f91a5c618dc7b0fdf2cee7970097f8e6b..98f78fa43d76a22e8423e1895b97daec656ef421 100644 (file)
--- a/framework/main/classes/commands/html/class_HtmlProblemCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlProblemCommand.php
@@ -6,7 +6,7 @@ namespace Org\Mxchange\CoreFramework\Command\Failed;
 use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
-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;
@@ -16,11 +16,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/commands/html/class_HtmlProblemCommand.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_HtmlProblemCommand.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *