Some updates:

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

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