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

[core.git] / framework / main / classes / commands / console / class_Console

diff --git a/framework/main/classes/commands/console/class_Console b/framework/main/classes/commands/console/class_Console
index d7be83464dbc1fac5fc9ba0ff06e6d12802ec39b..55ca37ceccffbe6deba509afac0c047509bec3d1 100644 (file)
--- a/framework/main/classes/commands/console/class_Console
+++ b/framework/main/classes/commands/console/class_Console
@@ -4,11 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/commands/console/class_Console
  * @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/commands/console/class_Console
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *