X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fimages%2Fclass_BaseImage.php;h=e83375f9953c95608efa99ef07d3638f89c05cb5;hp=d7cf32e3e0e603b6a32cb17cad8bfe8b274d9740;hb=b002c5909aa0f781505dde5414964b0f014cde01;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0

diff --git a/framework/main/classes/images/class_BaseImage.php b/framework/main/classes/images/class_BaseImage.php
index d7cf32e3..e83375f9 100644
--- a/framework/main/classes/images/class_BaseImage.php
+++ b/framework/main/classes/images/class_BaseImage.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Registry\Registerable;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/classes/images/class_BaseImage.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/classes/images/class_BaseImage.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *