X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Finterfaces%2Fclass_;fp=framework%2Fmain%2Finterfaces%2Fclass_;h=725dee1c6bec7e3fe3f1127400005d89717aa9fa;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hp=b7c59130b670dd726c7e26885cb0148bfb8c6dd8;hpb=1daff5a94de037022058d8760a06bd869de67630;p=core.git

diff --git a/framework/main/interfaces/class_ b/framework/main/interfaces/class_
index b7c59130..725dee1c 100644
--- a/framework/main/interfaces/class_
+++ b/framework/main/interfaces/class_
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/interfaces/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/interfaces/class_
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *