X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fcontroller%2Fhtml%2Fclass_Html;fp=framework%2Fmain%2Fclasses%2Fcontroller%2Fhtml%2Fclass_Html;h=06bc37cf7a49254dfb74ed100efadfe1a881370b;hp=dbecaee8d69c8d13317d14f87b8a045bad0aea63;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hpb=1daff5a94de037022058d8760a06bd869de67630

diff --git a/framework/main/classes/controller/html/class_Html b/framework/main/classes/controller/html/class_Html
index dbecaee8..06bc37cf 100644
--- a/framework/main/classes/controller/html/class_Html
+++ b/framework/main/classes/controller/html/class_Html
@@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/classes/controller/html/class_Html
  * @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_Html
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *