Some updates:

[core.git] / framework / main / interfaces / result / class_SearchableResult.php

diff --git a/framework/main/interfaces/result/class_SearchableResult.php b/framework/main/interfaces/result/class_SearchableResult.php
index 2daead2c2f53065d3b50323262bc915e9ba64615..186d3d1b25bb1a780eeeb594cb0921db6c24053a 100644 (file)
--- a/framework/main/interfaces/result/class_SearchableResult.php
+++ b/framework/main/interfaces/result/class_SearchableResult.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/result/class_SearchableResult.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/result/class_SearchableResult.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *