Remove the svnmerge-integrated property accidentally merged in from the func_realtim...
authorBJ Weschke <bweschke@btwtech.com>
Wed, 3 May 2006 12:31:26 +0000 (12:31 +0000)
committerBJ Weschke <bweschke@btwtech.com>
Wed, 3 May 2006 12:31:26 +0000 (12:31 +0000)
commit094a5b2974d5dda9bb0d4809fb1e31aa75a8724b
tree4e5f9ca204908a697dbfdce21b3127b37267b206
parent0abc9b0bd7e495488378e347b49cdf6525b4aa94
 Remove the svnmerge-integrated property accidentally merged in from the func_realtime branch merge last night.

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