Some updates:

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

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