X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=framework%2Fmain%2Finterfaces%2Fcriteria%2Fextended%2Fclass_AddableCriteria.php;h=c77157665ca0a9d42a3024c43497936bd6ec769a;hb=3b3b3bc253fa9c4020022edba682db85326ff039;hp=d057ceabf2c4d8337bac3ae21f0c7a036ae6460c;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;p=core.git

diff --git a/framework/main/interfaces/criteria/extended/class_AddableCriteria.php b/framework/main/interfaces/criteria/extended/class_AddableCriteria.php
index d057ceab..c7715766 100644
--- a/framework/main/interfaces/criteria/extended/class_AddableCriteria.php
+++ b/framework/main/interfaces/criteria/extended/class_AddableCriteria.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/interfaces/criteria/extended/class_AddableCriteria.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/criteria/extended/class_AddableCriteria.php
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2020 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *