X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fcontroller%2Fhtml%2Fclass_HtmlLogoutDoneController.php;fp=framework%2Fmain%2Fclasses%2Fcontroller%2Fhtml%2Fclass_HtmlLogoutDoneController.php;h=484a5bdcb482a2f8dc8f87507646e540d0c4ba93;hp=f906a76cb8ac35621ab6b6569be99b18620d3be5;hb=b002c5909aa0f781505dde5414964b0f014cde01;hpb=6a1f98717d2fdf0723c2852f99d15688755aac13

diff --git a/framework/main/classes/controller/html/class_HtmlLogoutDoneController.php b/framework/main/classes/controller/html/class_HtmlLogoutDoneController.php
index f906a76c..484a5bdc 100644
--- 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
  *