X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Finterfaces%2Ffilter%2Fclass_Filterable.php;h=81927529ae8cea5820722e9b52a085400e5e9afa;hp=6954bd7d83b5cac319e9e267ac2bf69bb916d1a7;hb=b002c5909aa0f781505dde5414964b0f014cde01;hpb=6a1f98717d2fdf0723c2852f99d15688755aac13

diff --git a/framework/main/interfaces/filter/class_Filterable.php b/framework/main/interfaces/filter/class_Filterable.php
index 6954bd7d..81927529 100644
--- a/framework/main/interfaces/filter/class_Filterable.php
+++ b/framework/main/interfaces/filter/class_Filterable.php
@@ -12,11 +12,7 @@ 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
  *