Some updates:

[core.git] / framework / main / classes / file_directories / binary / stack / class_StackFile.php

diff --git a/framework/main/classes/file_directories/binary/stack/class_StackFile.php b/framework/main/classes/file_directories/binary/stack/class_StackFile.php
index 444302ba74e7daa317816b0546a2ebe96cb325ab..3c980fc8e082bb39685514bbc0aea4506104b6ed 100644 (file)
--- a/framework/main/classes/file_directories/binary/stack/class_StackFile.php
+++ b/framework/main/classes/file_directories/binary/stack/class_StackFile.php
@@ -15,7 +15,11 @@ use \SplFileInfo;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/file_directories/binary/stack/class_StackFile.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/binary/stack/class_StackFile.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *