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
1.6.1
Russell Bryant 18 years ago
parent 3e439e9616
commit 72a2f228ae

Diff Content Not Available