From: BJ Weschke <bweschke@btwtech.com>
Date: Wed, 3 May 2006 12:31:26 +0000 (+0000)
Subject:  Remove the svnmerge-integrated property accidentally merged in from the func_realtim... 
X-Git-Tag: 1.4.0-beta1~1608
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=094a5b2974d5dda9bb0d4809fb1e31aa75a8724b;p=thirdparty%2Fasterisk.git

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