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

[core.git] / framework / main / interfaces / stacker / class_Stackable.php

diff --git a/framework/main/interfaces/stacker/class_Stackable.php b/framework/main/interfaces/stacker/class_Stackable.php
index 8cdb6e7dfaf1b46457c236c711cf06cfc7fef487..b1e783979c2179e3d0199debaa57a3682b76d7da 100644 (file)
--- a/framework/main/interfaces/stacker/class_Stackable.php
+++ b/framework/main/interfaces/stacker/class_Stackable.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/stacker/class_Stackable.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/stacker/class_Stackable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *