[asterisk-commits] file: trunk r80046 - /trunk/apps/app_voicemail.c
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon Aug 20 10:53:21 CDT 2007
Author: file
Date: Mon Aug 20 10:53:20 2007
New Revision: 80046
URL: http://svn.digium.com/view/asterisk?view=rev&rev=80046
Log:
Remove remnants of last commit so trunk builds again.
Modified:
trunk/apps/app_voicemail.c
Modified: trunk/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=80046&r1=80045&r2=80046
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Mon Aug 20 10:53:20 2007
@@ -6139,8 +6139,6 @@
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];
More information about the asterisk-commits
mailing list