Some updates:

[core.git] / framework / main / interfaces / database / middleware / class_DatabaseConnector.php

diff --git a/framework/main/interfaces/database/middleware/class_DatabaseConnector.php b/framework/main/interfaces/database/middleware/class_DatabaseConnector.php
index 0491b709ddec955e86aeaa1b3a11ee50555da062..bcc43a3b429e51ce56278d95f6d63a6fd245ebfc 100644 (file)
--- a/framework/main/interfaces/database/middleware/class_DatabaseConnector.php
+++ b/framework/main/interfaces/database/middleware/class_DatabaseConnector.php
@@ -1,19 +1,23 @@
 <?php
 // Own namespace
-namespace CoreFramework\Connector\Database;
+namespace Org\Mxchange\CoreFramework\Connector\Database;
 
 // Import framework stuff
-use CoreFramework\Criteria\Criteria;
-use CoreFramework\Criteria\Storing\StoreableCriteria;
-use CoreFramework\Database\Backend\DatabaseBackend;
-use CoreFramework\Database\FrameworkDatabase;
+use Org\Mxchange\CoreFramework\Criteria\Criteria;
+use Org\Mxchange\CoreFramework\Criteria\Storing\StoreableCriteria;
+use Org\Mxchange\CoreFramework\Database\Backend\DatabaseBackend;
+use Org\Mxchange\CoreFramework\Database\FrameworkDatabase;
 
 /**
  * An interface for middleware database classes
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/interfaces/database/middleware/class_DatabaseConnector.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/middleware/class_DatabaseConnector.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *