Some updates:

[core.git] / framework / main / classes / file_directories / text / input / class_BaseInputTextFile.php

diff --git a/framework/main/classes/file_directories/text/input/class_BaseInputTextFile.php b/framework/main/classes/file_directories/text/input/class_BaseInputTextFile.php
index 1767a55a753c620b47976b431863a763456d8f15..e4992bb0d170b3cba834828f7336fcd645a0f60c 100644 (file)
--- a/framework/main/classes/file_directories/text/input/class_BaseInputTextFile.php
+++ b/framework/main/classes/file_directories/text/input/class_BaseInputTextFile.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Filesystem\File\BaseTextFile;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/file_directories/text/input/class_BaseInputTextFile.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/input/class_BaseInputTextFile.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *