X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fexceptions%2Fcompressor%2Fclass_MismatchingCompressorsException.php;h=64686444bd1d387bf4893538624717942ce4a705;hb=498e6b065ce47804bff4e1073592a2cc8e28f8ef;hp=bca572be74984763fefb8d2a3b81deec928d524e;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;p=core.git

diff --git a/framework/main/exceptions/compressor/class_MismatchingCompressorsException.php b/framework/main/exceptions/compressor/class_MismatchingCompressorsException.php
index bca572be..64686444 100644
--- a/framework/main/exceptions/compressor/class_MismatchingCompressorsException.php
+++ b/framework/main/exceptions/compressor/class_MismatchingCompressorsException.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/compressor/class_MismatchingCompressorsException.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/compressor/class_MismatchingCompressorsException.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
  * @todo		Rename to CompressorMismatchException
@@ -40,7 +36,7 @@ class MismatchingCompressorsException extends FrameworkException {
 	 * @param	$code	Code number for the exception
 	 * @return	void
 	 */
-	public function __construct (array $array, $code) {
+	public function __construct (array $array, int $code) {
 		// Add a message around the missing class
 		$message = sprintf('[%s:%d] Der Kompressor %s zu den geladenen Daten aus %s und der aktuell verwendete Kompressor %s stimmen nicht &uuml;berein!',
 			$array[0]->__toString(),