Renamed Registry -> GenericRegistry to make it clear that this registry does

[core.git] / framework / main / classes / user / guest / class_Guest.php

diff --git a/framework/main/classes/user/guest/class_Guest.php b/framework/main/classes/user/guest/class_Guest.php
index 94e45ab26e2614472ee3874260fe737ce53e7148..60192e00a72b5a76ab02f0cd6146567659cc4d82 100644 (file)
--- a/framework/main/classes/user/guest/class_Guest.php
+++ b/framework/main/classes/user/guest/class_Guest.php
@@ -13,11 +13,7 @@ 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
  *