X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Finterfaces%2Fresult%2Fclass_UpdateableResult.php;h=e725a3e16b2dc880ad2cee41deafb3b02fc9f276;hp=21c5970b114b48201c7d8c805ec9f0c885270b0a;hb=HEAD;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0

diff --git a/framework/main/interfaces/result/class_UpdateableResult.php b/framework/main/interfaces/result/class_UpdateableResult.php
index 21c5970b..a07e3af8 100644
--- a/framework/main/interfaces/result/class_UpdateableResult.php
+++ b/framework/main/interfaces/result/class_UpdateableResult.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Criteria\Local\LocalUpdateCriteria;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/interfaces/result/class_UpdateableResult.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/result/class_UpdateableResult.php
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2023 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *