X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fhelper%2Fcaptcha%2Fweb%2Fclass_GraphicalCodeCaptcha.php;h=9ffe45aa02885c7eeef9c83d49bd3c2fe623ed10;hp=5f3045df7b254dea7ae983b20caa0d21d6a11fa6;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hpb=deb4c766b3c6af391dc3beb4a7a450ae2a6249c2 diff --git a/framework/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php b/framework/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php index 5f3045df..9ffe45aa 100644 --- a/framework/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php +++ b/framework/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.php @@ -1,18 +1,22 @@ * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/helper/captcha/web/class_GraphicalCodeCaptcha.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/web/class_GraphicalCodeCaptcha.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org *