Some updates:

[core.git] / framework / main / interfaces / database / class_DatabaseWrapper.php

diff --git a/framework/main/interfaces/database/class_DatabaseWrapper.php b/framework/main/interfaces/database/class_DatabaseWrapper.php
index e314256b3b2736e80c1738a66c1e96f8029d7209..401e85fd658db648f5d7567aa313a7e7a2b99cc1 100644 (file)
--- a/framework/main/interfaces/database/class_DatabaseWrapper.php
+++ b/framework/main/interfaces/database/class_DatabaseWrapper.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/database/class_DatabaseWrapper.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/interfaces/database/class_DatabaseWrapper.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *