X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Finterfaces%2Fclass_FrameworkInterface.php;h=f1d3725f5ff253651b7c3789a14a486d5a4fdc7d;hp=d40ffb35a47bc917550a72db16d118c2bf49ff2c;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hpb=1daff5a94de037022058d8760a06bd869de67630

diff --git a/framework/main/interfaces/class_FrameworkInterface.php b/framework/main/interfaces/class_FrameworkInterface.php
index d40ffb35..f1d3725f 100644
--- a/framework/main/interfaces/class_FrameworkInterface.php
+++ b/framework/main/interfaces/class_FrameworkInterface.php
@@ -8,7 +8,11 @@ namespace Org\Mxchange\CoreFramework\Generic;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/interfaces/class_FrameworkInterface.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/class_FrameworkInterface.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  * @todo		Find a better name for this interface