Renamed Registry -> GenericRegistry to make it clear that this registry does

[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 d6308eb89aef07d2c41912884f03ddb62e5fbfa2..0612f581d1a5d5c60b706af4810abb91e0d72c10 100644 (file)
--- a/framework/main/exceptions/socket/class_SocketAlreadyRegisteredException.php
+++ b/framework/main/exceptions/socket/class_SocketAlreadyRegisteredException.php
@@ -8,11 +8,7 @@ namespace Org\Mxchange\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
  *