X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fcontroller%2Fhtml%2Fclass_HtmlStatusController.php;h=eb5c5ab61d747b94cceb997c9464984a230d96c2;hp=9b82d4cfb37d5642c77e4fea3cfea10c47d245c0;hb=b002c5909aa0f781505dde5414964b0f014cde01;hpb=6a1f98717d2fdf0723c2852f99d15688755aac13

diff --git a/framework/main/classes/controller/html/class_HtmlStatusController.php b/framework/main/classes/controller/html/class_HtmlStatusController.php
index 9b82d4cf..eb5c5ab6 100644
--- a/framework/main/classes/controller/html/class_HtmlStatusController.php
+++ b/framework/main/classes/controller/html/class_HtmlStatusController.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_HtmlStatusController.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_HtmlStatusController.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