Renamed Registry -> GenericRegistry to make it clear that this registry does

[core.git] / framework / main / classes / tasks / class_BaseTask.php

diff --git a/framework/main/classes/tasks/class_BaseTask.php b/framework/main/classes/tasks/class_BaseTask.php
index d948a4d5b86700e83046c28d6f946c574d788d0b..4f53883cfea3bc55ff57e13b5cde159655e463ad 100644 (file)
--- a/framework/main/classes/tasks/class_BaseTask.php
+++ b/framework/main/classes/tasks/class_BaseTask.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/tasks/class_BaseTask.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/class_BaseTask.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *