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

[core.git] / framework / main / classes / lists / class_BaseList.php

diff --git a/framework/main/classes/lists/class_BaseList.php b/framework/main/classes/lists/class_BaseList.php
index 599b1bb4464d6cf170e10453c1277348e6e3fdd3..bb58363627f216a7fff2c56cc2c68282b760f1d7 100644 (file)
--- a/framework/main/classes/lists/class_BaseList.php
+++ b/framework/main/classes/lists/class_BaseList.php
@@ -17,11 +17,7 @@ use \Countable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/lists/class_BaseList.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/lists/class_BaseList.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *