Some updates:

[core.git] / framework / main / classes / stacker / class_

diff --git a/framework/main/classes/stacker/class_ b/framework/main/classes/stacker/class_
index c3c188ed2f2c8865658a28735ebf6f61817ff99d..629bcd4148d62f1db1781dd0433e68d65f4a301a 100644 (file)
--- a/framework/main/classes/stacker/class_
+++ b/framework/main/classes/stacker/class_
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Stacker\Stackable;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/stacker/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/classes/stacker/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *