Some updates:

[core.git] / framework / main / interfaces / filter / class_Filterable.php

diff --git a/framework/main/interfaces/filter/class_Filterable.php b/framework/main/interfaces/filter/class_Filterable.php
index 81927529ae8cea5820722e9b52a085400e5e9afa..6954bd7d83b5cac319e9e267ac2bf69bb916d1a7 100644 (file)
--- a/framework/main/interfaces/filter/class_Filterable.php
+++ b/framework/main/interfaces/filter/class_Filterable.php
@@ -12,7 +12,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/filter/class_Filterable.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/filter/class_Filterable.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *