X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=framework%2Fmain%2Fexceptions%2Fhelper%2Fclass_UserInstanceMissingException.php;h=aa046bef67200a2c8451de99b35c53ecd00e82ab;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hp=7ace47164d9bb79a69f5759dc81499084c67db57;hpb=78a010fef84895720e796842208f01dfb619c332;p=core.git

diff --git a/framework/main/exceptions/helper/class_UserInstanceMissingException.php b/framework/main/exceptions/helper/class_UserInstanceMissingException.php
index 7ace4716..aa046bef 100644
--- a/framework/main/exceptions/helper/class_UserInstanceMissingException.php
+++ b/framework/main/exceptions/helper/class_UserInstanceMissingException.php
@@ -1,16 +1,20 @@
 <?php
 // Own namespace
-namespace CoreFramework\Deprecated;
+namespace Org\Mxchange\CoreFramework\Deprecated;
 
 // Import framework stuff
-use CoreFramework\Generic\FrameworkException;
+use Org\Mxchange\CoreFramework\Generic\FrameworkException;
 
 /**
  * An exception thrown when a user instance is invalid
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/exceptions/helper/class_UserInstanceMissingException.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/exceptions/helper/class_UserInstanceMissingException.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  * @deprecated	Don't use this anymore