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

[core.git] / framework / main / classes / iterator / class_BaseIterator.php

diff --git a/framework/main/classes/iterator/class_BaseIterator.php b/framework/main/classes/iterator/class_BaseIterator.php
index eb9ae21e64902300331e9bb02f39955ad481fe2d..36f1bb0e30647b2f0759cd7ece4af27712b50898 100644 (file)
--- a/framework/main/classes/iterator/class_BaseIterator.php
+++ b/framework/main/classes/iterator/class_BaseIterator.php
@@ -13,11 +13,7 @@ use \Iterator;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/iterator/class_BaseIterator.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/iterator/class_BaseIterator.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *