Renamed Registry -> GenericRegistry to make it clear that this registry does

[core.git] / framework / main / interfaces / database / backend / class_DatabaseBackend.php

diff --git a/framework/main/interfaces/database/backend/class_DatabaseBackend.php b/framework/main/interfaces/database/backend/class_DatabaseBackend.php
index a354bb1527638fc2f5f0eec958c197c953c83ebd..13f2c61cba412ce95a350b0e8566dd4ee9b01d6d 100644 (file)
--- 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
  *