X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Ffilter%2Fverifier%2Fclass_GraphicalCodeCaptchaVerifierFilter.php;h=3a123427a76ad3dee257457fbb66f5f1192a7371;hb=8d8cf621bd811811cecd83c65a4ab91f27258e79;hp=db32135929f992b457edbaed0391c3c6d448e17b;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;p=core.git

diff --git a/framework/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php b/framework/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php
index db321359..3a123427 100644
--- a/framework/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php
@@ -14,11 +14,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.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/filter/verifier/class_GraphicalCodeCaptchaVerifierFilter.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *