Some updates:

[core.git] / framework / main / classes / lists / tasks / class_TaskList.php

diff --git a/framework/main/classes/lists/tasks/class_TaskList.php b/framework/main/classes/lists/tasks/class_TaskList.php
index 722fa150a3fd6880c775e4de9c5a48d1388e58f1..afe34e61d08fa6b6ebdb05d5293d2f5fd5b0cd89 100644 (file)
--- a/framework/main/classes/lists/tasks/class_TaskList.php
+++ b/framework/main/classes/lists/tasks/class_TaskList.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Lists\Listable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/lists/tasks/class_TaskList.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/tasks/class_TaskList.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *