Some updates:

[core.git] / framework / main / classes / points / class_UserPoints.php

diff --git a/framework/main/classes/points/class_UserPoints.php b/framework/main/classes/points/class_UserPoints.php
index 786446c60bf3bc95bfa3fa96e987eb4b8e324113..5f655a538f05ccfcb834b57ea415f6b25aebacae 100644 (file)
--- a/framework/main/classes/points/class_UserPoints.php
+++ b/framework/main/classes/points/class_UserPoints.php
@@ -15,7 +15,11 @@ use Org\Mxchange\CoreFramework\User\ManageableAccount;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/points/class_UserPoints.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/points/class_UserPoints.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *