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

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

diff --git a/framework/main/exceptions/socket/class_InvalidServerSocketException.php b/framework/main/exceptions/socket/class_InvalidServerSocketException.php
index 286e89c77fc6368e184b92c12e28669f8c87b1b3..d28e5d10e74f8cb9c43aa6834396254cfdf28981 100644 (file)
--- a/framework/main/exceptions/socket/class_InvalidServerSocketException.php
+++ b/framework/main/exceptions/socket/class_InvalidServerSocketException.php
@@ -7,11 +7,7 @@ namespace Org\Mxchange\CoreFramework\Socket;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/exceptions/socket/class_InvalidServerSocketException.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_InvalidServerSocketException.php
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *