Resolve conflicts, prepare for next batch of conflicts
authorOlle Johansson <oej@edvina.net>
Mon, 10 Apr 2006 19:55:39 +0000 (19:55 +0000)
committerOlle Johansson <oej@edvina.net>
Mon, 10 Apr 2006 19:55:39 +0000 (19:55 +0000)
commit8b1543974f2f568a5462afcf838d7ad382b95284
treef61b285a0a049d359696d5c19bac5384af79f6fa
parent70e407c5bedda9f3814190828b630967bcc88a18
Resolve conflicts, prepare for next batch of conflicts

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@18909 65c4cc65-6c06-0410-ace0-fbb531ad65f3
channels/chan_sip.c