X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Ftemplate%2Fconsole%2Fclass_ConsoleTemplateEngine.php;h=4367807f434b5d2a62bf682f3cf13babd6cf4faa;hp=f4f515e9f0286f4643d4149aa8acbc2e1a3f6508;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hpb=1daff5a94de037022058d8760a06bd869de67630

diff --git a/framework/main/classes/template/console/class_ConsoleTemplateEngine.php b/framework/main/classes/template/console/class_ConsoleTemplateEngine.php
index f4f515e9..4367807f 100644
--- a/framework/main/classes/template/console/class_ConsoleTemplateEngine.php
+++ b/framework/main/classes/template/console/class_ConsoleTemplateEngine.php
@@ -16,7 +16,11 @@ use \UnexpectedValueException;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/classes/template/console/class_ConsoleTemplateEngine.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/template/console/class_ConsoleTemplateEngine.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  * @todo		This template engine does not make use of setTemplateType()