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

[core.git] / framework / main / interfaces / resolver / class_Resolver.php

diff --git a/framework/main/interfaces/resolver/class_Resolver.php b/framework/main/interfaces/resolver/class_Resolver.php
index 2e8135cf72df414df1d697acd235f1ae4f1b8741..711fdc79bcc6180ef5cde6b1551b5250dd8e5385 100644 (file)
--- a/framework/main/interfaces/resolver/class_Resolver.php
+++ b/framework/main/interfaces/resolver/class_Resolver.php
@@ -10,11 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/interfaces/resolver/class_Resolver.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/resolver/class_Resolver.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *