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

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

diff --git a/framework/main/classes/filter/news/class_NewsDownloadFilter.php b/framework/main/classes/filter/news/class_NewsDownloadFilter.php
index 205043cf6c1a006db01e81284e631c2abc442f89..e9f2f06cad1d068dc3ee4dd692ca9e099089b686 100644 (file)
--- a/framework/main/classes/filter/news/class_NewsDownloadFilter.php
+++ b/framework/main/classes/filter/news/class_NewsDownloadFilter.php
@@ -6,7 +6,7 @@ namespace Org\Mxchange\CoreFramework\Filter\News;
 use Org\Mxchange\CoreFramework\Factory\News\HtmlNewsFactory;
 use Org\Mxchange\CoreFramework\Filter\BaseFilter;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -17,11 +17,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/news/class_NewsDownloadFilter.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_NewsDownloadFilter.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *