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

[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 22a146f2531e127ade3132935a50bfedac6437a5..113428a409b2af933b98191c03d703b8c5a07904 100644 (file)
--- 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
  *