Some updates:

[core.git] / framework / main / classes / helper / html / blocks / class_HtmlBlockHelper.php

diff --git a/framework/main/classes/helper/html/blocks/class_HtmlBlockHelper.php b/framework/main/classes/helper/html/blocks/class_HtmlBlockHelper.php
index ac4c008aef1d99dd2c27ea1877cf77d0c565bae9..b81c8025ff7084b800bbadce738d07683adc6754 100644 (file)
--- a/framework/main/classes/helper/html/blocks/class_HtmlBlockHelper.php
+++ b/framework/main/classes/helper/html/blocks/class_HtmlBlockHelper.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/helper/html/blocks/class_HtmlBlockHelper.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/helper/html/blocks/class_HtmlBlockHelper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *