Some updates:

[core.git] / framework / main / classes / output / debug / error / class_DebugErrorLogOutput.php

diff --git a/framework/main/classes/output/debug/error/class_DebugErrorLogOutput.php b/framework/main/classes/output/debug/error/class_DebugErrorLogOutput.php
index 2a7978695de5576ea631cf408a6aa0b84a305522..48911988e7be2e4159cd6cc6740daa8558659e79 100644 (file)
--- a/framework/main/classes/output/debug/error/class_DebugErrorLogOutput.php
+++ b/framework/main/classes/output/debug/error/class_DebugErrorLogOutput.php
@@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Stream\Output\OutputStreamer;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/output/debug/error/class_DebugErrorLogOutput.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/error/class_DebugErrorLogOutput.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *