From d810320a22370706a4e8b41d0d52d0d675bb710c Mon Sep 17 00:00:00 2001
From: Joshua Colp <jcolp@digium.com>
Date: Mon, 20 Aug 2007 15:53:20 +0000
Subject: [PATCH] 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
---
apps/app_voicemail.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 46c57ecce0..43750ed6c6 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];
--
GitLab