Some updates:

[core.git] / framework / main / classes / feature / class_BaseFeature.php

diff --git a/framework/main/classes/feature/class_BaseFeature.php b/framework/main/classes/feature/class_BaseFeature.php
index 68a30fe9a4b50a7b89d749a2537160cc60d74240..e439104b760af50ea0db1b9f3fd919843ba996de 100644 (file)
--- a/framework/main/classes/feature/class_BaseFeature.php
+++ b/framework/main/classes/feature/class_BaseFeature.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/feature/class_BaseFeature.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/classes/feature/class_BaseFeature.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *