From: Steve Murphy <murf@digium.com>
Date: Fri, 24 Nov 2006 18:17:25 +0000 (+0000)
Subject: removed the svnmerge-integrated property from trunk; it's confusing svnmerge in newly... 
X-Git-Tag: 1.6.0-beta1~3^2~3881
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7406c1b24286cfd8527d44195745a3daac605a60;p=thirdparty%2Fasterisk.git

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
---