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

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

diff --git a/framework/main/classes/controller/html/class_HtmlLogoutDoneController.php b/framework/main/classes/controller/html/class_HtmlLogoutDoneController.php
index f906a76cb8ac35621ab6b6569be99b18620d3be5..484a5bdcb482a2f8dc8f87507646e540d0c4ba93 100644 (file)
--- a/framework/main/classes/controller/html/class_HtmlLogoutDoneController.php
+++ b/framework/main/classes/controller/html/class_HtmlLogoutDoneController.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_HtmlLogoutDoneController.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_HtmlLogoutDoneController.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *