kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-06 01:45:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Oops, broke 1.6.0

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@165327 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-12-17 21:29:32 +00:00
parent f9e08bac6d
commit c4fc79c5c7
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/app_macro.c
View File

@@ -122,7 +122,6 @@ static void macro_fixup(void *data, struct ast_channel *old_chan, struct ast_cha
}
}
>>>>>>> .merge-right.r165319
static struct ast_exten *find_matching_priority(struct ast_context *c, const char *exten, int priority, const char *callerid)
{
struct ast_exten *e;