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

[core.git] / framework / main / classes / commands / console / class_ConsoleFuseCommand.php

diff --git a/framework/main/classes/commands/console/class_ConsoleFuseCommand.php b/framework/main/classes/commands/console/class_ConsoleFuseCommand.php
index 2d6452458d1a4d2a28334f85e3aa097d18e608a5..3744c1cff1e32125ed07a78ded407bd372f566e6 100644 (file)
--- a/framework/main/classes/commands/console/class_ConsoleFuseCommand.php
+++ b/framework/main/classes/commands/console/class_ConsoleFuseCommand.php
@@ -16,11 +16,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/commands/console/class_ConsoleFuseCommand.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/console/class_ConsoleFuseCommand.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *