Renamed Registry -> GenericRegistry to make it clear that this registry does

[core.git] / framework / main / interfaces / criteria / extended / class_StoreableCriteria.php

diff --git a/framework/main/interfaces/criteria/extended/class_StoreableCriteria.php b/framework/main/interfaces/criteria/extended/class_StoreableCriteria.php
index ebc067b78fa1a1bd5cc59857f3a6068e321b8066..f183a6add8f9ef0276ee746b3746bdc090180afe 100644 (file)
--- a/framework/main/interfaces/criteria/extended/class_StoreableCriteria.php
+++ b/framework/main/interfaces/criteria/extended/class_StoreableCriteria.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_StoreableCriteria.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_StoreableCriteria.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *