aboutsummaryrefslogtreecommitdiffstats
path: root/pbx/ael/ael.y
diff options
context:
space:
mode:
authorrizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b>2006-05-03 16:34:31 +0000
committerrizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b>2006-05-03 16:34:31 +0000
commitcb2e7e5fe0e8aa10e1ae005d7451e34379d106e3 (patch)
tree36ec8bdac0dc83e050d344606f029906422eb449 /pbx/ael/ael.y
parentfb458f5cf763e065d9ea3177bdc21dbf315d6a84 (diff)
remove more shift-reduce conflicts
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@24427 f38db490-d61c-443f-a65b-d21fe96a405b
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;}