X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Ftasks%2Fidle%2Fclass_IdleLoopTask.php;h=7652b5888a301c6436291533f8e90e3dda494137;hp=4b149324a04dac8a30793334273b3fc6b855b685;hb=b002c5909aa0f781505dde5414964b0f014cde01;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0

diff --git a/framework/main/classes/tasks/idle/class_IdleLoopTask.php b/framework/main/classes/tasks/idle/class_IdleLoopTask.php
index 4b149324..7652b588 100644
--- a/framework/main/classes/tasks/idle/class_IdleLoopTask.php
+++ b/framework/main/classes/tasks/idle/class_IdleLoopTask.php
@@ -13,11 +13,7 @@ use Org\Mxchange\CoreFramework\Visitor\Visitor;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/classes/tasks/idle/class_IdleLoopTask.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/tasks/idle/class_IdleLoopTask.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *