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

[core.git] / framework / main / interfaces / auth / class_Authorizeable.php

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