remove svnmerge-blocked property that is not supposed to be here
authorRussell Bryant <russell@russellbryant.com>
Wed, 19 Mar 2008 18:57:16 +0000 (18:57 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 19 Mar 2008 18:57:16 +0000 (18:57 +0000)
commit72a2f228aead07ccc751d5b16131de07ab4a1217
tree6d3fb14959e93c6b76f732c2db36622fe1b2e03e
parent3e439e96166186109a8d35aa391910dcab41a8f4
remove svnmerge-blocked property that is not supposed to be here

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