Some updates:

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

diff --git a/framework/main/classes/file_directories/output/text/class_FrameworkTextFileOutputPointer.php b/framework/main/classes/file_directories/output/text/class_FrameworkTextFileOutputPointer.php
index d94ec9ce86664f1203313ceee86a45b40ca88199..56c502f477bc0cfc8ed7a1b3da22a8a5d4cac165 100644 (file)
--- a/framework/main/classes/file_directories/output/text/class_FrameworkTextFileOutputPointer.php
+++ b/framework/main/classes/file_directories/output/text/class_FrameworkTextFileOutputPointer.php
@@ -17,7 +17,11 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/file_directories/output/text/class_FrameworkTextFileOutputPointer.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/output/text/class_FrameworkTextFileOutputPointer.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *