X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Frequest%2Fhtml%2Fclass_HtmlRequest.php;h=1326700259d049c14757b80d1b5b65974225b6ba;hp=714b4cc08deb4c70553577f434c70ea012b9cefb;hb=b002c5909aa0f781505dde5414964b0f014cde01;hpb=6a1f98717d2fdf0723c2852f99d15688755aac13

diff --git a/framework/main/classes/request/html/class_HtmlRequest.php b/framework/main/classes/request/html/class_HtmlRequest.php
index 714b4cc0..13267002 100644
--- a/framework/main/classes/request/html/class_HtmlRequest.php
+++ b/framework/main/classes/request/html/class_HtmlRequest.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Request\Requestable;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/classes/request/html/class_HtmlRequest.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/request/html/class_HtmlRequest.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  * @todo		Move out the cookie part to a seperate class, e.g. Cookie