From: Joshua Colp <jcolp@digium.com>
Date: Mon, 20 Aug 2007 15:53:20 +0000 (+0000)
Subject: Remove remnants of last commit so trunk builds again.
X-Git-Tag: 1.6.0-beta1~1678
X-Git-Url: http://git.asterisk.org/gitweb/?p=asterisk%2Fasterisk.git;a=commitdiff_plain;h=d810320a22370706a4e8b41d0d52d0d675bb710c

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

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 46c57ec..43750ed 100644
--- 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];