X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Foutput%2Fconsole%2Fclass_ConsoleOutput.php;fp=framework%2Fmain%2Fclasses%2Foutput%2Fconsole%2Fclass_ConsoleOutput.php;h=d48acd3097fef8ccec156f05732660682594a522;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hp=3d75464aef0eb4256b68cbff391e9d800359884e;hpb=1daff5a94de037022058d8760a06bd869de67630;p=core.git

diff --git a/framework/main/classes/output/console/class_ConsoleOutput.php b/framework/main/classes/output/console/class_ConsoleOutput.php
index 3d75464a..d48acd30 100644
--- a/framework/main/classes/output/console/class_ConsoleOutput.php
+++ b/framework/main/classes/output/console/class_ConsoleOutput.php
@@ -14,7 +14,11 @@ use Org\Mxchange\CoreFramework\Stream\Output\OutputStreamer;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/classes/output/console/class_ConsoleOutput.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/output/console/class_ConsoleOutput.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *