From: Anthony Minessale <anthm@freeswitch.org>
Date: Tue, 14 Nov 2017 18:28:25 +0000 (-0600)
Subject: FS-10762: [freeswitch-core] Websocket logic error #resolve
X-Git-Tag: v1.8.1~3^2~191
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d5e52a01256b1b8e5ad1913b7283d427d60a36b;p=thirdparty%2Ffreeswitch.git

FS-10762: [freeswitch-core] Websocket logic error #resolve
---

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 057976b4c1..4b6b39e5d0 100644
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1,5 @@
+<<<<<<< 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