diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-19 18:57:16 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-19 18:57:16 +0000 |
| commit | 32f21b4a96fa1ac730819bea4bdb0ae010099ab9 (patch) | |
| tree | 6d3fb14959e93c6b76f732c2db36622fe1b2e03e /res | |
| parent | d2b5adddae1c889db0ba5e65c1b94c719289b788 (diff) | |
remove svnmerge-blocked property that is not supposed to be here
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@110023 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions