X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fuser%2Fguest%2Fclass_Guest.php;h=94e45ab26e2614472ee3874260fe737ce53e7148;hp=60192e00a72b5a76ab02f0cd6146567659cc4d82;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hpb=1daff5a94de037022058d8760a06bd869de67630

diff --git a/framework/main/classes/user/guest/class_Guest.php b/framework/main/classes/user/guest/class_Guest.php
index 60192e00..94e45ab2 100644
--- a/framework/main/classes/user/guest/class_Guest.php
+++ b/framework/main/classes/user/guest/class_Guest.php
@@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\User\BaseUser;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/classes/user/guest/class_Guest.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/user/guest/class_Guest.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *