remove svnmerge-integrated property
authorRussell Bryant <russell@russellbryant.com>
Wed, 23 Aug 2006 17:44:33 +0000 (17:44 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 23 Aug 2006 17:44:33 +0000 (17:44 +0000)
commit3155cad50d7e7e32798b6156363c7d666dc1a256
tree668d860eb51bc300b6ff414962b9b98d06bd7486
parentec7bd6614aa48dda33badc26be909b15c49b30cb
remove svnmerge-integrated property

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