X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fdatabase%2Ffrontend%2Fclass_NewsDatabaseWrapper.php;h=20874d8a7be25d7706d6d1541b216ef456807b41;hp=0a94efad607eafe12df8502e4fb9806962ee777e;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hpb=78a010fef84895720e796842208f01dfb619c332

diff --git a/framework/main/classes/database/frontend/class_NewsDatabaseWrapper.php b/framework/main/classes/database/frontend/class_NewsDatabaseWrapper.php
index 0a94efad..20874d8a 100644
--- a/framework/main/classes/database/frontend/class_NewsDatabaseWrapper.php
+++ b/framework/main/classes/database/frontend/class_NewsDatabaseWrapper.php
@@ -1,17 +1,21 @@
 <?php
 // Own namespace
-namespace CoreFramework\Database\Wrapper\News;
+namespace Org\Mxchange\CoreFramework\Database\Frontend\News;
 
 // Import framework stuff
-use CoreFramework\Database\Wrapper\BaseDatabaseWrapper;
-use CoreFramework\Registry\Registerable;
+use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseWrapper;
+use Org\Mxchange\CoreFramework\Registry\Registerable;
 
 /**
  * A database wrapper for news classes
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/classes/database/frontend/class_NewsDatabaseWrapper.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/frontend/class_NewsDatabaseWrapper.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  * @todo		Add missing own interface for public methods