Fix a conflict in flag values
authorMark Michelson <mmichelson@digium.com>
Tue, 23 Sep 2008 23:33:33 +0000 (23:33 +0000)
committerMark Michelson <mmichelson@digium.com>
Tue, 23 Sep 2008 23:33:33 +0000 (23:33 +0000)
commitad859c943e4229cd61aea3f94c8d8db055ee51c6
tree98342cbd39f329bd3a50877b55dad27ca9ce19bb
parent8343faed0e1bb06610c0a92a67ae97fdf8e47fb7
Fix a conflict in flag values

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