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

[core.git] / framework / main / classes / template / class_

diff --git a/framework/main/classes/template/class_ b/framework/main/classes/template/class_
index 5e16c25145ff8169f7d1985d1e93ad71d488e456..fbea34b6f3ce938f6f3c663adb975a7a1386b278 100644 (file)
--- a/framework/main/classes/template/class_
+++ b/framework/main/classes/template/class_
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Template\Engine\BaseTemplateEngine;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/template/class_
  * @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/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *