X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fstacker%2Ffile%2Fclass_;h=b3a3934a296b64453879dd106e456f45f9b78d9c;hp=952279a2827b85105b6700f13ec22e643887dcb4;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hpb=1daff5a94de037022058d8760a06bd869de67630

diff --git a/framework/main/classes/stacker/file/class_ b/framework/main/classes/stacker/file/class_
index 952279a2..b3a3934a 100644
--- 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
+<<<<<<< HEAD:framework/main/classes/stacker/file/class_
  * @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
  *