X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Finterfaces%2Fcriteria%2Fclass_Criteria.php;fp=framework%2Fmain%2Finterfaces%2Fcriteria%2Fclass_Criteria.php;h=f3bcf61a1978512c12a1eb576b7e53919c33557d;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hp=ae646cd4ca6369a25b719d01a4782292ac8c82f6;hpb=1daff5a94de037022058d8760a06bd869de67630;p=core.git

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