From 094a5b2974d5dda9bb0d4809fb1e31aa75a8724b Mon Sep 17 00:00:00 2001 From: BJ Weschke Date: Wed, 3 May 2006 12:31:26 +0000 Subject: [PATCH] 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