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

[core.git] / framework / main / exceptions / database / class_

diff --git a/framework/main/exceptions/database/class_ b/framework/main/exceptions/database/class_
index fc36e2a13d39939bc36c5caa6022f23cbea2dd3e..5098f7bac507eb032d85620804cab94d3983a4aa 100644 (file)
--- a/framework/main/exceptions/database/class_
+++ b/framework/main/exceptions/database/class_
@@ -4,11 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/database/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/exceptions/database/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *