summaryrefslogtreecommitdiff
path: root/pbx/ael/ael.y
diff options
context:
space:
mode:
authorLuigi Rizzo <rizzo@icir.org>2006-05-03 16:34:31 +0000
committerLuigi Rizzo <rizzo@icir.org>2006-05-03 16:34:31 +0000
commit7695df3896a212ceda53b26cf45e31fdc21f1b90 (patch)
tree36ec8bdac0dc83e050d344606f029906422eb449 /pbx/ael/ael.y
parent820ef229517d62f852c3f6c9d963e3391073f47a (diff)
remove more shift-reduce conflicts
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24427 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'pbx/ael/ael.y')
-rw-r--r--pbx/ael/ael.y3
1 files changed, 1 insertions, 2 deletions
diff --git a/pbx/ael/ael.y b/pbx/ael/ael.y
index f9b543594..bf3e56061 100644
--- a/pbx/ael/ael.y
+++ b/pbx/ael/ael.y
@@ -558,8 +558,7 @@ case_statement: KW_CASE word COLON statements {
;
macro_statements: /* empty */ { $$ = NULL; }
- | macro_statement {$$ = $1;}
- | macro_statements macro_statement { $$ = linku1($1, $2); }
+ | macro_statement macro_statements { $$ = linku1($1, $2); }
;
macro_statement : statement {$$=$1;}