No more conflicts on properties! svnmerge-block be gone!
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51515 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
fa6d3941df
commit
445abea012