X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fexceptions%2Fsocket%2Fclass_SocketOptionException.php;fp=framework%2Fmain%2Fexceptions%2Fsocket%2Fclass_SocketOptionException.php;h=b701c4e976a2009bed8de32f9a250670dbb84889;hp=54cd20dfbe1acbc7f78b84be6ff99d61306ee887;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hpb=1daff5a94de037022058d8760a06bd869de67630

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