Some updates:

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

diff --git a/framework/main/classes/database/class_ b/framework/main/classes/database/class_
index 1e6e7a3e2db648c5693573f3b94b92b47ecf6ad5..1a8bf5fdf28f56601f11cfe2c384c9113e13621c 100644 (file)
--- a/framework/main/classes/database/class_
+++ b/framework/main/classes/database/class_
@@ -5,7 +5,11 @@
  * @see                        DatabaseBackendInterface - An interface for database backends
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/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/classes/database/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *