X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fresponse%2Fhtml%2Fclass_HtmlResponse.php;h=ed0504930fd68177a2216b4ea5b0a47a0a373387;hp=07036f7104810e766afdf83770d3d044dd59b7af;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hpb=1daff5a94de037022058d8760a06bd869de67630

diff --git a/framework/main/classes/response/html/class_HtmlResponse.php b/framework/main/classes/response/html/class_HtmlResponse.php
index 07036f71..ed050493 100644
--- a/framework/main/classes/response/html/class_HtmlResponse.php
+++ b/framework/main/classes/response/html/class_HtmlResponse.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/classes/response/html/class_HtmlResponse.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/response/html/class_HtmlResponse.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *