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)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@110023 65c4cc65-6c06-0410-ace0-fbb531ad65f3


No differences found