Some updates:

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

diff --git a/framework/main/exceptions/socket/class_SocketAlreadyRegisteredException.php b/framework/main/exceptions/socket/class_SocketAlreadyRegisteredException.php
index ecd4c8ef0fd069451abea1941943476cb23261d6..d6308eb89aef07d2c41912884f03ddb62e5fbfa2 100644 (file)
--- a/framework/main/exceptions/socket/class_SocketAlreadyRegisteredException.php
+++ b/framework/main/exceptions/socket/class_SocketAlreadyRegisteredException.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace CoreFramework\Socket;
+namespace Org\Mxchange\CoreFramework\Socket;
 
 /**
  * This exception is thrown if the socket is already registered in a matching
@@ -8,7 +8,11 @@ namespace CoreFramework\Socket;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/exceptions/socket/class_SocketAlreadyRegisteredException.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_SocketAlreadyRegisteredException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *