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

diff --git a/framework/main/classes/stacker/file/class_ b/framework/main/classes/stacker/file/class_
index b3a3934a..069af8a6 100644
--- a/framework/main/classes/stacker/file/class_
+++ b/framework/main/classes/stacker/file/class_
@@ -4,11 +4,7 @@
  *
  * @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_
+ * @copyright	Copyright (c) 2020 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *