Some updates:

[core.git] / framework / main / classes / decorator / class_BaseDecorator.php

diff --git a/framework/main/classes/decorator/class_BaseDecorator.php b/framework/main/classes/decorator/class_BaseDecorator.php
index 5ab0019cfeb84fee3d0d4441b5bd29fae286674d..e8f5ae237f3fd7b77b11acd0c584b4df8e9d39d0 100644 (file)
--- a/framework/main/classes/decorator/class_BaseDecorator.php
+++ b/framework/main/classes/decorator/class_BaseDecorator.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/decorator/class_BaseDecorator.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/decorator/class_BaseDecorator.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *