From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 19 Mar 2008 18:57:16 +0000 (+0000)
Subject: remove svnmerge-blocked property that is not supposed to be here
X-Git-Tag: 1.6.0-beta7~70
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=72a2f228aead07ccc751d5b16131de07ab4a1217;p=thirdparty%2Fasterisk.git

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
---