Some updates:

[core.git] / framework / main / exceptions / compressor / class_MismatchingCompressorsException.php

diff --git a/framework/main/exceptions/compressor/class_MismatchingCompressorsException.php b/framework/main/exceptions/compressor/class_MismatchingCompressorsException.php
index 6a66dbe537b94b5b4b005e5403c0f7471c7f397c..bca572be74984763fefb8d2a3b81deec928d524e 100644 (file)
--- a/framework/main/exceptions/compressor/class_MismatchingCompressorsException.php
+++ b/framework/main/exceptions/compressor/class_MismatchingCompressorsException.php
@@ -10,7 +10,11 @@ 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
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               Rename to CompressorMismatchException