From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 7 Jan 2015 17:18:29 +0000 (-0600)
Subject: sofia rebuild
X-Git-Tag: v1.6.2~614^2~499
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=287a6c3cb491d0fce96db65258997fc8c9cfb57e;p=thirdparty%2Ffreeswitch.git

sofia rebuild
---

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 07dc3e7bc0..c5d4dc7b82 100644
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1,9 +1,18 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 Wed Feb 11 12:35:25 EST 2015
 =======
+=======
+>>>>>>> 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
+>>>>>>> sofia rebuild