X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fdatabase%2Fclass_;h=1a8bf5fdf28f56601f11cfe2c384c9113e13621c;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hp=ba818289b1be51313bd4d1907744ff147a7a8e9f;hpb=78a010fef84895720e796842208f01dfb619c332;p=core.git

diff --git a/framework/main/classes/database/class_ b/framework/main/classes/database/class_
index ba818289..1a8bf5fd 100644
--- 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
  *
@@ -32,7 +36,5 @@ class  extends BaseDatabaseBackend implements DatabaseBackendInterface {
 		// Call parent constructor
 		parent::__construct($class);
 	}
-}
 
-// [EOF]
-?>
+}