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

[core.git] / framework / main / classes / filter / news / class_NewsProcessFilter.php

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