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

diff --git a/framework/main/interfaces/criteria/extended/class_LocalSearchCriteria.php b/framework/main/interfaces/criteria/extended/class_LocalSearchCriteria.php
index cc0b0747..10ee38ad 100644
--- a/framework/main/interfaces/criteria/extended/class_LocalSearchCriteria.php
+++ b/framework/main/interfaces/criteria/extended/class_LocalSearchCriteria.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Criteria\Criteria;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/interfaces/criteria/extended/class_LocalSearchCriteria.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_LocalSearchCriteria.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *