Some updates:

[core.git] / framework / main / interfaces / captcha / class_SolveableCaptcha.php

diff --git a/framework/main/interfaces/captcha/class_SolveableCaptcha.php b/framework/main/interfaces/captcha/class_SolveableCaptcha.php
index 5545289cb2a1839929827a5eaead7f01942e5a7e..bb087f12f0b3d31e10a395a017fc561e6a1f9567 100644 (file)
--- a/framework/main/interfaces/captcha/class_SolveableCaptcha.php
+++ b/framework/main/interfaces/captcha/class_SolveableCaptcha.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Helper\Helper;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/captcha/class_SolveableCaptcha.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/interfaces/captcha/class_SolveableCaptcha.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *