Renamed Registry -> GenericRegistry to make it clear that this registry does

[core.git] / framework / main / interfaces / template / class_CompileableTemplate.php

diff --git a/framework/main/interfaces/template/class_CompileableTemplate.php b/framework/main/interfaces/template/class_CompileableTemplate.php
index 761e5619a3b9af3082668e78990d598fba498dc5..480a25af022a985fbcdfed0e7d65d78af7aabfd1 100644 (file)
--- a/framework/main/interfaces/template/class_CompileableTemplate.php
+++ b/framework/main/interfaces/template/class_CompileableTemplate.php
@@ -12,11 +12,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/template/class_CompileableTemplate.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/template/class_CompileableTemplate.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *