From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 7 Jan 2015 02:12:33 +0000 (-0600)
Subject: sofia update
X-Git-Tag: v1.6.2~614^2~500
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d030a0c5bc1d65f08a8687cbc7b248fca4a8a94;p=thirdparty%2Ffreeswitch.git

sofia update
---

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index f5b42d453c..07dc3e7bc0 100644
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1,9 @@
+<<<<<<< HEAD
 Wed Feb 11 12:35:25 EST 2015
+=======
+<<<<<<< HEAD
+Wed Jan  7 11:24:56 PST 2015
+=======
+Tue Jan  6 20:12:24 CST 2015
+>>>>>>> sofia update
+>>>>>>> sofia update