X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fresolver%2Fcommand%2Fimage%2Fclass_ImageCommandResolver.php;h=0c9ce924c3960dfa0c5a00a396a0bad4ed792839;hp=9e642c38979840d6229c4569af38c2295c1b05f6;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hpb=1daff5a94de037022058d8760a06bd869de67630

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