Socket modifications

html/search/all_d.js

@@ -1,9 +1,5 @@
 var searchData=
 [
   ['whitelist_71',['whiteList',['../classcore_1_1TCPServer.html#abad6300b6234ca8b69cef9128755342e',1,'core::TCPServer']]],
-<<<<<<< HEAD
   ['write_72',['write',['../classcore_1_1Socket.html#a4ed587f31d080115c00828f90b1e28bb',1,'core::Socket']]]
-=======
-  ['write_72',['write',['../classcore_1_1Socket.html#a1413c826307ef0f29d7457770af675e3',1,'core::Socket']]]
->>>>>>> subscription
 ];

html/search/functions_b.js

@@ -1,8 +1,4 @@
 var searchData=
 [
-<<<<<<< HEAD
   ['write_146',['write',['../classcore_1_1Socket.html#a4ed587f31d080115c00828f90b1e28bb',1,'core::Socket']]]
-=======
-  ['write_146',['write',['../classcore_1_1Socket.html#a1413c826307ef0f29d7457770af675e3',1,'core::Socket']]]
->>>>>>> subscription
 ];