X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fuser%2Fclass_BaseUser.php;h=d4e1d511676747462aa428cf66558f96571908ec;hb=b002c5909aa0f781505dde5414964b0f014cde01;hp=393ebee06bb2e4d430c18237b84e43242c7d4729;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;p=core.git

diff --git a/framework/main/classes/user/class_BaseUser.php b/framework/main/classes/user/class_BaseUser.php
index 393ebee0..d4e1d511 100644
--- a/framework/main/classes/user/class_BaseUser.php
+++ b/framework/main/classes/user/class_BaseUser.php
@@ -15,11 +15,7 @@ use Org\Mxchange\CoreFramework\Result\Search\SearchableResult;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/classes/user/class_BaseUser.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/class_BaseUser.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *