Some updates:

[core.git] / framework / main / classes / stacker / file / class_

diff --git a/framework/main/classes/stacker/file/class_ b/framework/main/classes/stacker/file/class_
index 952279a2827b85105b6700f13ec22e643887dcb4..b3a3934a296b64453879dd106e456f45f9b78d9c 100644 (file)
--- a/framework/main/classes/stacker/file/class_
+++ b/framework/main/classes/stacker/file/class_
@@ -4,7 +4,11 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0

+<<<<<<< HEAD:framework/main/classes/stacker/file/class_

  * @copyright  Copyright (c) 2017 Core Developer Team
  * @copyright  Copyright (c) 2017 Core Developer Team

+=======
+ * @copyright  Copyright (c) 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/stacker/file/class_

  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *