X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fhelper%2Fhtml%2Fclass_BaseHtmlHelper.php;h=5617d41e3cb64b050c86f658b9da3434e40b8ab1;hp=1f439d8e4426b5cc7ef2be20a0925974c679bab9;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hpb=1daff5a94de037022058d8760a06bd869de67630

diff --git a/framework/main/classes/helper/html/class_BaseHtmlHelper.php b/framework/main/classes/helper/html/class_BaseHtmlHelper.php
index 1f439d8e..5617d41e 100644
--- a/framework/main/classes/helper/html/class_BaseHtmlHelper.php
+++ b/framework/main/classes/helper/html/class_BaseHtmlHelper.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Helper\BaseHelper;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/classes/helper/html/class_BaseHtmlHelper.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/class_BaseHtmlHelper.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *