X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fexceptions%2Fsocket%2Fclass_NoSocketErrorDetectedException.php;h=ae9fab9594528c1e7b2bcce42603090a868e7f5e;hp=16eb3235c3e291c8f1ed63eefbeb6f5628e4de19;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hpb=78a010fef84895720e796842208f01dfb619c332

diff --git a/framework/main/exceptions/socket/class_NoSocketErrorDetectedException.php b/framework/main/exceptions/socket/class_NoSocketErrorDetectedException.php
index 16eb3235..ae9fab95 100644
--- a/framework/main/exceptions/socket/class_NoSocketErrorDetectedException.php
+++ b/framework/main/exceptions/socket/class_NoSocketErrorDetectedException.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace CoreFramework\Socket;
+namespace Org\Mxchange\CoreFramework\Socket;
 
 /**
  * This exception is thrown when socket_last_error() has returned zero value
@@ -9,7 +9,11 @@ namespace CoreFramework\Socket;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/exceptions/socket/class_NoSocketErrorDetectedException.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/socket/class_NoSocketErrorDetectedException.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  * @todo		Those are logic exceptions and should be rewritten