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

[core.git] / framework / main / classes / factories / html / class_HtmlNewsFactory.php

diff --git a/framework/main/classes/factories/html/class_HtmlNewsFactory.php b/framework/main/classes/factories/html/class_HtmlNewsFactory.php
index 062d6755d2d981151f4358b3b8d1b16efb00cbfb..880606a1092d1ba1b7812db4b4ffe6fcb1434d27 100644 (file)
--- a/framework/main/classes/factories/html/class_HtmlNewsFactory.php
+++ b/framework/main/classes/factories/html/class_HtmlNewsFactory.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Request\Requestable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/factories/html/class_HtmlNewsFactory.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/factories/html/class_HtmlNewsFactory.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *