X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=framework%2Fmain%2Fclasses%2Fdatabase%2Fclass_BaseDatabaseResult.php;fp=framework%2Fmain%2Fclasses%2Fdatabase%2Fclass_BaseDatabaseResult.php;h=e0f9a950992580f575663c07f012cdb43c7ce4fa;hb=b002c5909aa0f781505dde5414964b0f014cde01;hp=5a78394a9f77f59021879f0474b2de6982686c08;hpb=6a1f98717d2fdf0723c2852f99d15688755aac13;p=core.git

diff --git a/framework/main/classes/database/class_BaseDatabaseResult.php b/framework/main/classes/database/class_BaseDatabaseResult.php
index 5a78394a..e0f9a950 100644
--- a/framework/main/classes/database/class_BaseDatabaseResult.php
+++ b/framework/main/classes/database/class_BaseDatabaseResult.php
@@ -11,11 +11,7 @@ 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
  *