projects
/
asterisk/asterisk.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0ef2670
)
Remove remnants of last commit so trunk builds again.
author
Joshua Colp
<jcolp@digium.com>
Mon, 20 Aug 2007 15:53:20 +0000
(15:53 +0000)
committer
Joshua Colp
<jcolp@digium.com>
Mon, 20 Aug 2007 15:53:20 +0000
(15:53 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@80046
65c4cc65
-6c06-0410-ace0-
fbb531ad65f3
apps/app_voicemail.c
patch
|
blob
|
history
diff --git
a/apps/app_voicemail.c
b/apps/app_voicemail.c
index
46c57ec
..
43750ed
100644
(file)
--- 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;
}
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];
static int vm_intro(struct ast_channel *chan, struct ast_vm_user *vmu, struct vm_state *vms)
{
char prefile[256];