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

[core.git] / framework / main / classes / index / class_BaseIndex.php

diff --git a/framework/main/classes/index/class_BaseIndex.php b/framework/main/classes/index/class_BaseIndex.php
index 24e9f79dc2a25bf601f18861bdb1be3b5b316c19..dbc65fe8b79a46c5a40b5eb8705409ed1bf9d2b2 100644 (file)
--- a/framework/main/classes/index/class_BaseIndex.php
+++ b/framework/main/classes/index/class_BaseIndex.php
@@ -17,11 +17,7 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/index/class_BaseIndex.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/index/class_BaseIndex.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *