Some updates:

[core.git] / framework / main / classes / iterator / class_

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