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

[core.git] / framework / main / interfaces / actions / commands / class_Commandable.php

diff --git a/framework/main/interfaces/actions/commands/class_Commandable.php b/framework/main/interfaces/actions/commands/class_Commandable.php
index b1b099e0a8b90a3bba3b2c035104e392cb388514..d4c60e2dc117e3af860b7eeaaff8888b8a809aac 100644 (file)
--- a/framework/main/interfaces/actions/commands/class_Commandable.php
+++ b/framework/main/interfaces/actions/commands/class_Commandable.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Request\Requestable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/actions/commands/class_Commandable.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/interfaces/actions/commands/class_Commandable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *