X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fresolver%2Fcontroller%2Fimage%2Fclass_ImageControllerResolver.php;h=02024241224bf99dfc97c9dcbd3a37f996f1bade;hp=e8c970156df36770c58f30adcf48de3d70035f76;hb=b002c5909aa0f781505dde5414964b0f014cde01;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0

diff --git a/framework/main/classes/resolver/controller/image/class_ImageControllerResolver.php b/framework/main/classes/resolver/controller/image/class_ImageControllerResolver.php
index e8c97015..02024241 100644
--- a/framework/main/classes/resolver/controller/image/class_ImageControllerResolver.php
+++ b/framework/main/classes/resolver/controller/image/class_ImageControllerResolver.php
@@ -16,11 +16,7 @@ use \InvalidArgumentException;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/classes/resolver/controller/image/class_ImageControllerResolver.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/resolver/controller/image/class_ImageControllerResolver.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *