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

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

diff --git a/framework/main/classes/request/class_ b/framework/main/classes/request/class_
index f46f50006d467635b989106dd61e9b81ad236fb1..48b31ceab0c1b3bdcd83f51b37fb5ed703cf1ae1 100644 (file)
--- a/framework/main/classes/request/class_
+++ b/framework/main/classes/request/class_
@@ -7,11 +7,7 @@ namespace CoreFramework\Request;
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/request/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/request/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *