X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fimages%2Fclass_;fp=framework%2Fmain%2Fclasses%2Fimages%2Fclass_;h=67f9fda2a4cbf0993a32a2c0be341a28b6dde7cd;hp=2197725e6e098e3f6722e6743482c31aeb77cda2;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hpb=1daff5a94de037022058d8760a06bd869de67630

diff --git a/framework/main/classes/images/class_ b/framework/main/classes/images/class_
index 2197725e..67f9fda2 100644
--- a/framework/main/classes/images/class_
+++ b/framework/main/classes/images/class_
@@ -4,7 +4,11 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/classes/images/class_
  * @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/images/class_
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *