X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Frequest%2Fclass_;fp=framework%2Fmain%2Fclasses%2Frequest%2Fclass_;h=f46f50006d467635b989106dd61e9b81ad236fb1;hp=48b31ceab0c1b3bdcd83f51b37fb5ed703cf1ae1;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hpb=1daff5a94de037022058d8760a06bd869de67630

diff --git a/framework/main/classes/request/class_ b/framework/main/classes/request/class_
index 48b31cea..f46f5000 100644
--- a/framework/main/classes/request/class_
+++ b/framework/main/classes/request/class_
@@ -7,7 +7,11 @@ namespace CoreFramework\Request;
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/classes/request/class_
  * @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/class_
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *