Some updates:

[core.git] / framework / main / interfaces / stacker / file / class_StackableFile.php

diff --git a/framework/main/interfaces/stacker/file/class_StackableFile.php b/framework/main/interfaces/stacker/file/class_StackableFile.php
index c3f9ebc941527b226f60c60c61a2d9b6cbac1ff0..b4526e2193a12d0dd37a46036eebb93527deee2b 100644 (file)
--- a/framework/main/interfaces/stacker/file/class_StackableFile.php
+++ b/framework/main/interfaces/stacker/file/class_StackableFile.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Stacker\Stackable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/stacker/file/class_StackableFile.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/interfaces/stacker/file/class_StackableFile.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *