removed the svnmerge-integrated property from trunk; it's confusing svnmerge in newly created branches
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@47997 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
ca7e77d4ef
commit
b30237cd27