removed the svnmerge-integrated property from trunk; it's confusing svnmerge in newly...
authorSteve Murphy <murf@digium.com>
Fri, 24 Nov 2006 18:17:25 +0000 (18:17 +0000)
committerSteve Murphy <murf@digium.com>
Fri, 24 Nov 2006 18:17:25 +0000 (18:17 +0000)
commit7406c1b24286cfd8527d44195745a3daac605a60
tree583bc83abc00a7cd5dc6f7a0e5abc5ed3113afc6
parent6d270eacf478c32a990230fd955c0dee20b1ce3f
removed the svnmerge-integrated property from trunk; it's confusing svnmerge in newly created branches

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47997 65c4cc65-6c06-0410-ace0-fbb531ad65f3