X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fcommands%2Fclass_BaseCommand.php;h=8417f019398162d076837f3c5f440f8306448979;hp=b66949885f9e03039bef9caeb95ea14b176bb0c8;hb=b002c5909aa0f781505dde5414964b0f014cde01;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0

diff --git a/framework/main/classes/commands/class_BaseCommand.php b/framework/main/classes/commands/class_BaseCommand.php
index b6694988..8417f019 100644
--- a/framework/main/classes/commands/class_BaseCommand.php
+++ b/framework/main/classes/commands/class_BaseCommand.php
@@ -5,7 +5,7 @@ namespace Org\Mxchange\CoreFramework\Command;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -14,11 +14,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/classes/commands/class_BaseCommand.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/class_BaseCommand.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *
@@ -60,7 +56,7 @@ abstract class BaseCommand extends BaseFrameworkSystem {
 		assert(!$requestInstance->isPostRequestMethod());
 
 		// Get the application instance
-		$applicationInstance = Registry::getRegistry()->getInstance('app');
+		$applicationInstance = GenericRegistry::getRegistry()->getInstance('app');
 
 		// Prepare a template instance
 		$templateInstance = $this->prepareTemplateInstance($applicationInstance);