X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Finterfaces%2Factions%2Fclass_PerformableAction.php;h=cea2b8b32cc12693efb71c61f5b85b9e6307a128;hp=9a99d9e0e23a7d9e9ca17154be7457b522954d22;hb=f57dd51863ec9baacba447d76b46d5c709b9b02e;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0

diff --git a/framework/main/interfaces/actions/class_PerformableAction.php b/framework/main/interfaces/actions/class_PerformableAction.php
index 9a99d9e0..cea2b8b3 100644
--- a/framework/main/interfaces/actions/class_PerformableAction.php
+++ b/framework/main/interfaces/actions/class_PerformableAction.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/interfaces/actions/class_PerformableAction.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/interfaces/actions/class_PerformableAction.php
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2019 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *