X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fcompressor%2Fclass_Bzip2Compressor.php;h=71d35e267588e7952f5a87f11fa30f956383828b;hp=bf19554a77b538e390e3d1df3274ee7043a9c772;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hpb=4f9cf34b521892cb99fae9b21b92787f3d555b74

diff --git a/framework/main/classes/compressor/class_Bzip2Compressor.php b/framework/main/classes/compressor/class_Bzip2Compressor.php
index bf19554a..71d35e26 100644
--- a/framework/main/classes/compressor/class_Bzip2Compressor.php
+++ b/framework/main/classes/compressor/class_Bzip2Compressor.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/classes/compressor/class_Bzip2Compressor.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/classes/compressor/class_Bzip2Compressor.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *