Remove remnants of last commit so trunk builds again.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80046 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-20 15:53:20 +00:00 · 2007-08-20 15:53:20 +00:00 · d810320a22
parent 0ef2670e8f
commit d810320a22
1 changed files with 0 additions and 2 deletions
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@ -6139,8 +6139,6 @@ static int vm_intro_ua(struct ast_channel *chan,struct vm_state *vms)
 	return res;
 }

-
->>>>>>> .merge-right.r80044
 static int vm_intro(struct ast_channel *chan, struct ast_vm_user *vmu, struct vm_state *vms)
 {
 	char prefile[256];