Some updates:

[core.git] / framework / main / classes / file_directories / text / output / class_BaseOutputTextFile.php

diff --git a/framework/main/classes/file_directories/text/output/class_BaseOutputTextFile.php b/framework/main/classes/file_directories/text/output/class_BaseOutputTextFile.php
index 30212999244066aa58eaf965f39e48ddc653f06f..00894d0a73e3073391d3f14e2304d4e982566881 100644 (file)
--- a/framework/main/classes/file_directories/text/output/class_BaseOutputTextFile.php
+++ b/framework/main/classes/file_directories/text/output/class_BaseOutputTextFile.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Output\BaseOutput;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/file_directories/text/output/class_BaseOutputTextFile.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/file_directories/text/output/class_BaseOutputTextFile.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *