X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fexceptions%2Fbase64%2Fclass_Base64EncodingModuloException.php;h=64bb8d9d63b4aedeb65fd2109b5528a3ed0abf7d;hb=498e6b065ce47804bff4e1073592a2cc8e28f8ef;hp=ea6b81612c37376bb8e6dbfebfd543ade7ed8252;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;p=core.git

diff --git a/framework/main/exceptions/base64/class_Base64EncodingModuloException.php b/framework/main/exceptions/base64/class_Base64EncodingModuloException.php
index ea6b8161..64bb8d9d 100644
--- a/framework/main/exceptions/base64/class_Base64EncodingModuloException.php
+++ b/framework/main/exceptions/base64/class_Base64EncodingModuloException.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/base64/class_Base64EncodingModuloException.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/base64/class_Base64EncodingModuloException.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
  * @deprecated	Don't use this anymore
@@ -40,7 +36,7 @@ class Base64EncodingModuloException extends FrameworkException {
 	 * @param	$code			Error code
 	 * @return	void
 	 */
-	public function __construct (array $messageArray, $code) {
+	public function __construct (array $messageArray, int $code) {
 		// Construct message
 		$message = sprintf('[%s:%d] Data length %s modulo 4 is not zero: data=%s',
 			$messageArray[0]->__toString(),