Some updates:

[core.git] / framework / main / classes / helper / captcha / images / class_ImageHelper.php

diff --git a/framework/main/classes/helper/captcha/images/class_ImageHelper.php b/framework/main/classes/helper/captcha/images/class_ImageHelper.php
index da87bb80dcb72bde873c64b80b663ff1fcdd3e12..81f30c7e62c80d7ddf5367de1dbaffef5aa1fd04 100644 (file)
--- a/framework/main/classes/helper/captcha/images/class_ImageHelper.php
+++ b/framework/main/classes/helper/captcha/images/class_ImageHelper.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/helper/captcha/images/class_ImageHelper.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/helper/captcha/images/class_ImageHelper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *