Some updates:

[core.git] / framework / main / classes / helper / captcha / class_

diff --git a/framework/main/classes/helper/captcha/class_ b/framework/main/classes/helper/captcha/class_
index a7d9d73f34a6f644276a130ca002990ee817ee35..5eefd012e25cb534b537ed842d8e70968601ecaf 100644 (file)
--- a/framework/main/classes/helper/captcha/class_
+++ b/framework/main/classes/helper/captcha/class_
@@ -3,14 +3,18 @@
 namespace CoreFramework\Captcha\;
 
 // Import framework stuff
-use CoreFramework\Generic\FrameworkInterface;
+use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
 
 /**
  * A solveable CAPTCHA
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/helper/captcha/class_
  * @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/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *