Some updates:

[core.git] / framework / main / classes / database / class_BaseDatabaseBackend.php

diff --git a/framework/main/classes/database/class_BaseDatabaseBackend.php b/framework/main/classes/database/class_BaseDatabaseBackend.php
index 025a9879059997d12672390d1ae1673dbe4cd4c4..ad33fae184cb44648d5e78ab358f16ddb0301258 100644 (file)
--- a/framework/main/classes/database/class_BaseDatabaseBackend.php
+++ b/framework/main/classes/database/class_BaseDatabaseBackend.php
@@ -13,7 +13,11 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
  * @see                        DatabaseBackend - An interface for database backends
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/database/class_BaseDatabaseBackend.php
  * @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_BaseDatabaseBackend.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *