Edit the merge properties to match their names.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328880 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
136bf9c5f4
commit
c3f7a9eab8