X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Finterfaces%2Fdatabase%2Fbackend%2Fclass_DatabaseBackend.php;h=13f2c61cba412ce95a350b0e8566dd4ee9b01d6d;hp=a354bb1527638fc2f5f0eec958c197c953c83ebd;hb=b002c5909aa0f781505dde5414964b0f014cde01;hpb=6a1f98717d2fdf0723c2852f99d15688755aac13

diff --git a/framework/main/interfaces/database/backend/class_DatabaseBackend.php b/framework/main/interfaces/database/backend/class_DatabaseBackend.php
index a354bb15..13f2c61c 100644
--- a/framework/main/interfaces/database/backend/class_DatabaseBackend.php
+++ b/framework/main/interfaces/database/backend/class_DatabaseBackend.php
@@ -16,11 +16,7 @@ use Org\Mxchange\CoreFramework\Database\FrameworkDatabase;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
-<<<<<<< HEAD:framework/main/interfaces/database/backend/class_DatabaseBackend.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/backend/class_DatabaseBackend.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *