X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Finterfaces%2Fcriteria%2Fextended%2Fclass_AddableCriteria.php;fp=framework%2Fmain%2Finterfaces%2Fcriteria%2Fextended%2Fclass_AddableCriteria.php;h=df52c7e1fb1047842d0ebde1b6dfbc649dc5f1d2;hp=d057ceabf2c4d8337bac3ae21f0c7a036ae6460c;hb=b002c5909aa0f781505dde5414964b0f014cde01;hpb=6a1f98717d2fdf0723c2852f99d15688755aac13

diff --git a/framework/main/interfaces/criteria/extended/class_AddableCriteria.php b/framework/main/interfaces/criteria/extended/class_AddableCriteria.php
index d057ceab..df52c7e1 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
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *