X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=framework%2Fmain%2Fclasses%2Foutput%2Fdebug%2Fconsole%2Fclass_DebugConsoleOutput.php;fp=framework%2Fmain%2Fclasses%2Foutput%2Fdebug%2Fconsole%2Fclass_DebugConsoleOutput.php;h=113428a409b2af933b98191c03d703b8c5a07904;hb=b002c5909aa0f781505dde5414964b0f014cde01;hp=22a146f2531e127ade3132935a50bfedac6437a5;hpb=6a1f98717d2fdf0723c2852f99d15688755aac13;p=core.git

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