X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Factions%2Fclass_;h=a5d9364c3bf83f7af4a460b344aa4466c7648c8b;hp=786e8349293f85184e34b6c56e1ba066dd393640;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hpb=1daff5a94de037022058d8760a06bd869de67630

diff --git a/framework/main/classes/actions/class_ b/framework/main/classes/actions/class_
index 786e8349..a5d9364c 100644
--- 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
  *