Some updates:

[core.git] / framework / main / classes / tools / console / class_ConsoleTools.php

diff --git a/framework/main/classes/tools/console/class_ConsoleTools.php b/framework/main/classes/tools/console/class_ConsoleTools.php
index feafde705c0702c1ee0375fd07b0189fc29b29cc..fbf17137972b3644132cdcad5eadfdb69dbf5ccb 100644 (file)
--- a/framework/main/classes/tools/console/class_ConsoleTools.php
+++ b/framework/main/classes/tools/console/class_ConsoleTools.php
@@ -18,7 +18,11 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/tools/console/class_ConsoleTools.php
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Hub Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/console/class_ConsoleTools.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *