Some updates:

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

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