X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fexceptions%2Fmain%2Fclass_AssertionException.php;h=523f20d1b4018bda1833c9cca1abdbe8524ce78e;hb=498e6b065ce47804bff4e1073592a2cc8e28f8ef;hp=dc337c4ff3430760ca9344198d08db0566e0b9c0;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;p=core.git

diff --git a/framework/main/exceptions/main/class_AssertionException.php b/framework/main/exceptions/main/class_AssertionException.php
index dc337c4f..523f20d1 100644
--- a/framework/main/exceptions/main/class_AssertionException.php
+++ b/framework/main/exceptions/main/class_AssertionException.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/exceptions/main/class_AssertionException.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/main/class_AssertionException.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
  *
@@ -39,7 +35,7 @@ class AssertionException extends FrameworkException {
 	 * @param	$code		Code number for the exception
 	 * @return	void
 	 */
-	public function __construct ($message, $code) {
+	public function __construct (string $message, int $code) {
 		// Call parent constructor
 		parent::__construct($message, $code);
 	}