Some updates:

[core.git] / framework / main / interfaces / helper / template / class_HelpableTemplate.php

diff --git a/framework/main/interfaces/helper/template/class_HelpableTemplate.php b/framework/main/interfaces/helper/template/class_HelpableTemplate.php
index 5122260eed997a4b7d1ba3d646aa679e47994a4a..63848249803768dff632244a1d77a364e63982f6 100644 (file)
--- a/framework/main/interfaces/helper/template/class_HelpableTemplate.php
+++ b/framework/main/interfaces/helper/template/class_HelpableTemplate.php
@@ -10,7 +10,11 @@ use Org\Mxchange\CoreFramework\Helper\Helper;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/helper/template/class_HelpableTemplate.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/interfaces/helper/template/class_HelpableTemplate.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *