From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 9 Sep 2015 17:26:03 +0000 (-0500)
Subject: FS-7486 #resolve update sofia
X-Git-Tag: v1.6.2~1^2~98
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba5aa94ce8fe6fdd86c76b8d19040593788be4df;p=thirdparty%2Ffreeswitch.git

FS-7486 #resolve update sofia
---

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 5c4b697a66..984a340a65 100644
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1,26 +1 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-Wed Feb 11 12:35:25 EST 2015
-=======
-=======
->>>>>>> sofia rebuild
-=======
->>>>>>> sofia rebuild
-<<<<<<< HEAD
-Wed Jan  7 11:24:56 PST 2015
-=======
-Tue Jan  6 20:12:24 CST 2015
->>>>>>> sofia update
-<<<<<<< HEAD
->>>>>>> sofia update
-=======
-=======
-Wed Jan  7 11:18:02 CST 2015
->>>>>>> sofia rebuild
-<<<<<<< HEAD
-=======
-=======
-Mon Jan 12 11:34:52 CST 2015
->>>>>>> sofia rebuild
->>>>>>> sofia rebuild
+Wed Sep  9 12:25:38 CDT 2015