X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fdatabase%2Ffrontend%2Fclass_UserPointsDatabaseWrapper.php;h=affde5b06788c607d0427e271f292435b34a4656;hp=d9242d8aa8b60e547b6da819533a2191726fc8ee;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hpb=1daff5a94de037022058d8760a06bd869de67630

diff --git a/framework/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php b/framework/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php
index d9242d8a..affde5b0 100644
--- a/framework/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php
+++ b/framework/main/classes/database/frontend/class_UserPointsDatabaseWrapper.php
@@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Result\Update\UpdateableResult;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/classes/database/frontend/class_UserPointsDatabaseWrapper.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/database/frontend/class_UserPointsDatabaseWrapper.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *