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

[core.git] / framework / main / classes / controller / html / class_HtmlDefaultController.php

diff --git a/framework/main/classes/controller/html/class_HtmlDefaultController.php b/framework/main/classes/controller/html/class_HtmlDefaultController.php
index 55f6b1a7b01df1953009249b0164808db0fdb4ff..c2e579daa510bc97da68a385aa7153a6751f81bf 100644 (file)
--- a/framework/main/classes/controller/html/class_HtmlDefaultController.php
+++ b/framework/main/classes/controller/html/class_HtmlDefaultController.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/controller/html/class_HtmlDefaultController.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/controller/html/class_HtmlDefaultController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               This controller shall still provide some headlines for sidebars