sofia rebuild

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index c5d4dc7b822567df6a611c980a7e815a9bcf98c6..5c4b697a661553da4736dcae14482eeef14eead1 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1,9 +1,12 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 Wed Feb 11 12:35:25 EST 2015
 =======
 =======
 >>>>>>> sofia rebuild
+=======
+>>>>>>> sofia rebuild
 <<<<<<< HEAD
 Wed Jan  7 11:24:56 PST 2015
 =======
@@ -15,4 +18,9 @@ Tue Jan  6 20:12:24 CST 2015
 =======
 Wed Jan  7 11:18:02 CST 2015
 >>>>>>> sofia rebuild
+<<<<<<< HEAD
+=======
+=======
+Mon Jan 12 11:34:52 CST 2015
+>>>>>>> sofia rebuild
 >>>>>>> sofia rebuild