Some updates:

[core.git] / framework / main / classes / class_Base

diff --git a/framework/main/classes/class_Base b/framework/main/classes/class_Base
index fa83634580d13ad3893ab0641ede25637d2e51ea..b2eb7bf5c3e18dc571e66cd27f0002983b7d86ee 100644 (file)
--- a/framework/main/classes/class_Base
+++ b/framework/main/classes/class_Base
@@ -4,7 +4,11 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/class_Base
  * @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/class_Base
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *