X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=framework%2Fmain%2Fclasses%2Flists%2Ftasks%2Fclass_TaskList.php;fp=framework%2Fmain%2Fclasses%2Flists%2Ftasks%2Fclass_TaskList.php;h=722fa150a3fd6880c775e4de9c5a48d1388e58f1;hb=b002c5909aa0f781505dde5414964b0f014cde01;hp=afe34e61d08fa6b6ebdb05d5293d2f5fd5b0cd89;hpb=6a1f98717d2fdf0723c2852f99d15688755aac13;p=core.git

diff --git a/framework/main/classes/lists/tasks/class_TaskList.php b/framework/main/classes/lists/tasks/class_TaskList.php
index afe34e61..722fa150 100644
--- a/framework/main/classes/lists/tasks/class_TaskList.php
+++ b/framework/main/classes/lists/tasks/class_TaskList.php
@@ -11,11 +11,7 @@ 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
  *