Some updates:

[core.git] / framework / main / classes / compressor / class_Bzip2Compressor.php

diff --git a/framework/main/classes/compressor/class_Bzip2Compressor.php b/framework/main/classes/compressor/class_Bzip2Compressor.php
index 16bffd47b21137ab1fbef2edec3c576381258b79..71d35e267588e7952f5a87f11fa30f956383828b 100644 (file)
--- a/framework/main/classes/compressor/class_Bzip2Compressor.php
+++ b/framework/main/classes/compressor/class_Bzip2Compressor.php
@@ -1,17 +1,21 @@
 <?php
 // Own namespace
-namespace CoreFramework\Compressor\Bzip2;
+namespace Org\Mxchange\CoreFramework\Compressor\Bzip2;
 
 // Import framework stuff
-use CoreFramework\Compressor\Compressor;
-use CoreFramework\Object\BaseFrameworkSystem;
+use Org\Mxchange\CoreFramework\Compressor\Compressor;
+use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
 
 /**
  * BZIP2 compression and decompression class
  *
  * @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
  *