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

[core.git] / framework / main / interfaces / index / class_Indexable.php

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