X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fexceptions%2Fsocket%2Fclass_UnsupportedSocketErrorHandlerException.php;h=64d60363d10e157a583610e3bf356e67e53b4214;hp=0c9e7948157b1c6ac68c69ee7c4f3c016d002d84;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hpb=1daff5a94de037022058d8760a06bd869de67630

diff --git a/framework/main/exceptions/socket/class_UnsupportedSocketErrorHandlerException.php b/framework/main/exceptions/socket/class_UnsupportedSocketErrorHandlerException.php
index 0c9e7948..64d60363 100644
--- a/framework/main/exceptions/socket/class_UnsupportedSocketErrorHandlerException.php
+++ b/framework/main/exceptions/socket/class_UnsupportedSocketErrorHandlerException.php
@@ -8,7 +8,11 @@ namespace Org\Mxchange\CoreFramework\Socket;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/exceptions/socket/class_UnsupportedSocketErrorHandlerException.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_UnsupportedSocketErrorHandlerException.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *