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

[core.git] / framework / main / interfaces / application / class_ManageableApplication.php

diff --git a/framework/main/interfaces/application/class_ManageableApplication.php b/framework/main/interfaces/application/class_ManageableApplication.php
index 1f6dcb56c0ac0652da0b8bab9d3366f0c58dcc90..bf409cba03938f754c0ea35e8f42bc014dc169ec 100644 (file)
--- a/framework/main/interfaces/application/class_ManageableApplication.php
+++ b/framework/main/interfaces/application/class_ManageableApplication.php
@@ -16,11 +16,7 @@ use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/application/class_ManageableApplication.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/application/class_ManageableApplication.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *