Continued:

[core.git] / framework / main / interfaces / database / wrapper / class_BookablePointsWrapper.php

diff --git a/framework/main/interfaces/database/wrapper/class_BookablePointsWrapper.php b/framework/main/interfaces/database/wrapper/class_BookablePointsWrapper.php
index 223eab792991734edf865e02ee2a02ac568b5bee..a1c65263af7b89dfa3e1d5f990bb35f26ad03c81 100644 (file)
--- a/framework/main/interfaces/database/wrapper/class_BookablePointsWrapper.php
+++ b/framework/main/interfaces/database/wrapper/class_BookablePointsWrapper.php
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Result\Update\UpdateableResult;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/database/wrapper/class_BookablePointsWrapper.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/interfaces/database/wrapper/class_BookablePointsWrapper.php
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2020 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -44,7 +40,7 @@ interface BookablePointsWrapper extends DatabaseWrapper {
        /**
         * Updates an user database entry with given result
         *
-        * @param       $resultInstance         An instance of a Updateable database result
+        * @param       $resultInstance         An instance of a UpdateableResult class
         * @return      void
         */
        function doUpdateByResult (UpdateableResult $resultInstance);