FS-8761: [freeswitch-core] Memory leak in FreeSWITCH

2017-11-20 15:23:54 -06:00 · 2017-11-20 15:23:54 -06:00 · 892181bbc2
parent bcd5753d17
commit 892181bbc2
1 changed files with 1 additions and 5 deletions
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@ -1,5 +1 @@
-<<<<<<< HEAD
-Mon Jan 15 01:36:14 EST 2018
-=======
-Tue Nov 14 12:28:03 CST 2017
->>>>>>> 96a8ad2378... FS-10762: [freeswitch-core] Websocket logic error #resolve
+Mon Jan 15 01:37:50 EST 2018