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=54cd20dfbe1acbc7f78b84be6ff99d61306ee887;hp=b701c4e976a2009bed8de32f9a250670dbb84889;hb=b002c5909aa0f781505dde5414964b0f014cde01;hpb=6a1f98717d2fdf0723c2852f99d15688755aac13

diff --git a/framework/main/exceptions/socket/class_SocketOptionException.php b/framework/main/exceptions/socket/class_SocketOptionException.php
index b701c4e9..54cd20df 100644
--- a/framework/main/exceptions/socket/class_SocketOptionException.php
+++ b/framework/main/exceptions/socket/class_SocketOptionException.php
@@ -9,11 +9,7 @@ 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
  *