Some updates:

[core.git] / framework / main / classes / client / class_BaseClient.php

diff --git a/framework/main/classes/client/class_BaseClient.php b/framework/main/classes/client/class_BaseClient.php
index 040046d22267046d74fbfa93bdfd6250ae174190..79333d5c527585318287999ea2b0305fe1e723c8 100644 (file)
--- a/framework/main/classes/client/class_BaseClient.php
+++ b/framework/main/classes/client/class_BaseClient.php
@@ -1,16 +1,20 @@
 <?php
 // Own namespace
-namespace CoreFramework\Client;
+namespace Org\Mxchange\CoreFramework\Client;
 
 // Import framework stuff
-use CoreFramework\Object\BaseFrameworkSystem;
+use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem;
 
 /**
  * A general client class
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/client/class_BaseClient.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/client/class_BaseClient.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -27,7 +31,7 @@ use CoreFramework\Object\BaseFrameworkSystem;
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-class BaseClient extends BaseFrameworkSystem {
+abstract class BaseClient extends BaseFrameworkSystem {
        /**
         * Protected constructor
         *