Renamed Registry -> GenericRegistry to make it clear that this registry does

[core.git] / framework / main / middleware / compressor / class_CompressorChannel.php

diff --git a/framework/main/middleware/compressor/class_CompressorChannel.php b/framework/main/middleware/compressor/class_CompressorChannel.php
index 622244dce623e59148aec47b399b6ba5d81bc59a..8ec776d9c935ac8ff3c0d883540d1d0a94867606 100644 (file)
--- a/framework/main/middleware/compressor/class_CompressorChannel.php
+++ b/framework/main/middleware/compressor/class_CompressorChannel.php
@@ -13,11 +13,7 @@ use Org\Mxchange\CoreFramework\Registry\Registerable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/middleware/compressor/class_CompressorChannel.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/middleware/compressor/class_CompressorChannel.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *