X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=framework%2Fmain%2Fclasses%2Fcommands%2Fimage%2Fclass_ImageCodeCaptchaCommand.php;h=ef36945cc149e092ac9d0dd9076da4cb7f1d3ee0;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hp=b61bcfddddfbb2d663393a2c95128a06ccfaafa6;hpb=146c8b3c929a1b0ab17d6605e5ae949ac44899c1;p=core.git diff --git a/framework/main/classes/commands/image/class_ImageCodeCaptchaCommand.php b/framework/main/classes/commands/image/class_ImageCodeCaptchaCommand.php index b61bcfdd..ef36945c 100644 --- a/framework/main/classes/commands/image/class_ImageCodeCaptchaCommand.php +++ b/framework/main/classes/commands/image/class_ImageCodeCaptchaCommand.php @@ -1,22 +1,26 @@ * @version 0.0.0 +<<<<<<< HEAD:framework/main/classes/commands/image/class_ImageCodeCaptchaCommand.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/commands/image/class_ImageCodeCaptchaCommand.php * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org *