Some updates:

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

diff --git a/framework/main/classes/tasks/class_ b/framework/main/classes/tasks/class_
index 41a5bbcda6126f8afd6357ffaa42227c9a4c8cbb..fe6ac768bcfae324b074254cdd89d140bda40c0d 100644 (file)
--- a/framework/main/classes/tasks/class_
+++ b/framework/main/classes/tasks/class_
@@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Visitor\Visitor;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/tasks/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/tasks/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *