diff options
| author | Joshua Colp <jcolp@digium.com> | 2007-08-20 15:53:20 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2007-08-20 15:53:20 +0000 |
| commit | d810320a22370706a4e8b41d0d52d0d675bb710c (patch) | |
| tree | a69843bbd1f91e032c84da7e578c3eb6afefa47a /apps | |
| parent | 0ef2670e8fc5ebf037b89c34abff3379c89bfb5b (diff) | |
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
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_voicemail.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 46c57ecce..43750ed6c 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]; |