Some updates:

[core.git] / framework / main / classes / file_directories / input / raw / class_FrameworkRawFileInputPointer.php

diff --git a/framework/main/classes/file_directories/input/raw/class_FrameworkRawFileInputPointer.php b/framework/main/classes/file_directories/input/raw/class_FrameworkRawFileInputPointer.php
index fc3ab6db530a6af9e537c1fb605f06116251ef0f..1481444f436de64a42c0c89eea2004469b4150b9 100644 (file)
--- a/framework/main/classes/file_directories/input/raw/class_FrameworkRawFileInputPointer.php
+++ b/framework/main/classes/file_directories/input/raw/class_FrameworkRawFileInputPointer.php
@@ -20,7 +20,11 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/file_directories/input/raw/class_FrameworkRawFileInputPointer.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/input/raw/class_FrameworkRawFileInputPointer.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *