Continued:

[core.git] / framework / main / interfaces / class_FrameworkInterface.php

diff --git a/framework/main/interfaces/class_FrameworkInterface.php b/framework/main/interfaces/class_FrameworkInterface.php
index f1d3725f5ff253651b7c3789a14a486d5a4fdc7d..d40ffb35a47bc917550a72db16d118c2bf49ff2c 100644 (file)
--- a/framework/main/interfaces/class_FrameworkInterface.php
+++ b/framework/main/interfaces/class_FrameworkInterface.php
@@ -8,11 +8,7 @@ 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