Some updates:

[core.git] / framework / main / classes / filter / class_BaseFilter.php

diff --git a/framework/main/classes/filter/class_BaseFilter.php b/framework/main/classes/filter/class_BaseFilter.php
index 18c78800ba5b062f594d7edef3b6053a1eb3abbb..7285f7513e243c16bc27acd0845dd97880b7006f 100644 (file)
--- a/framework/main/classes/filter/class_BaseFilter.php
+++ b/framework/main/classes/filter/class_BaseFilter.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/filter/class_BaseFilter.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/classes/filter/class_BaseFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *