Continued:

[core.git] / framework / main / exceptions / result / class_ResultUpdateException.php

diff --git a/framework/main/exceptions/result/class_ResultUpdateException.php b/framework/main/exceptions/result/class_ResultUpdateException.php
index b46b2887f0d4be46f0a16a008e40c8d2f9e64b81..f08a59f68c687071ab16139c59fdfe91650b2a71 100644 (file)
--- a/framework/main/exceptions/result/class_ResultUpdateException.php
+++ b/framework/main/exceptions/result/class_ResultUpdateException.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/exceptions/result/class_ResultUpdateException.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/exceptions/result/class_ResultUpdateException.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
  *
@@ -40,7 +36,7 @@ class ResultUpdateException extends FrameworkException {
         * @param       $code                           Error code
         * @return      void
         */
-       public function __construct (UpdateableResult $resultInstance, $code) {
+       public function __construct (UpdateableResult $resultInstance, int $code) {
                // Construct the message
                $message = sprintf('[%s:%d] Update of result instance has nothing changed.',
                        $resultInstance->__toString(),