Some updates:

[core.git] / framework / main / classes / output / debug / console / class_DebugConsoleOutput.php

diff --git a/framework/main/classes/output/debug/console/class_DebugConsoleOutput.php b/framework/main/classes/output/debug/console/class_DebugConsoleOutput.php
index 94cb24feb7e8580ba446fea2d7627bc568c11083..22a146f2531e127ade3132935a50bfedac6437a5 100644 (file)
--- a/framework/main/classes/output/debug/console/class_DebugConsoleOutput.php
+++ b/framework/main/classes/output/debug/console/class_DebugConsoleOutput.php
@@ -1,21 +1,25 @@
 <?php
 // Own namespace
-namespace CoreFramework\Debug\Output;
+namespace Org\Mxchange\CoreFramework\Debug\Output;
 
 // Import framework stuff
-use CoreFramework\Bootstrap\FrameworkBootstrap;
-use CoreFramework\Debug\Debugger;
-use CoreFramework\Generic\UnsupportedOperationException;
-use CoreFramework\Output\Debug\BaseDebugOutput;
-use CoreFramework\Registry\Registerable;
-use CoreFramework\Stream\Output\OutputStreamer;
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
+use Org\Mxchange\CoreFramework\Debug\Debugger;
+use Org\Mxchange\CoreFramework\Generic\UnsupportedOperationException;
+use Org\Mxchange\CoreFramework\Output\Debug\BaseDebugOutput;
+use Org\Mxchange\CoreFramework\Registry\Registerable;
+use Org\Mxchange\CoreFramework\Stream\Output\OutputStreamer;
 
 /**
  * A debug output class for the console (e.g. hub software)
  *
  * @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
  *