Some updates:

[core.git] / framework / main / exceptions / socket / class_NoSocketErrorDetectedException.php

diff --git a/framework/main/exceptions/socket/class_NoSocketErrorDetectedException.php b/framework/main/exceptions/socket/class_NoSocketErrorDetectedException.php
index 16eb3235c3e291c8f1ed63eefbeb6f5628e4de19..ae9fab9594528c1e7b2bcce42603090a868e7f5e 100644 (file)
--- 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