Some updates:

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

diff --git a/framework/main/classes/compressor/class_NullCompressor.php b/framework/main/classes/compressor/class_NullCompressor.php
index 3bc22cc8049fdb735285dd2f8fb2607f7aee7b1f..50722313b15b231a871d81a0a4ac822ffe18f96e 100644 (file)
--- a/framework/main/classes/compressor/class_NullCompressor.php
+++ b/framework/main/classes/compressor/class_NullCompressor.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_NullCompressor.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_NullCompressor.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *