summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorOndrej Zajicek <santiago@crfreenet.org>2010-01-28 16:00:16 +0100
committerOndrej Zajicek <santiago@crfreenet.org>2010-01-28 16:00:16 +0100
commit1a7a4e59a22f903a0be791f229e86ab881593851 (patch)
tree5142a24df2fba39fe8e532152fa018992577a0a7 /conf
parent41677025ee67fcccd34493f9b205037dd68811c9 (diff)
parent1960d20350c5191b089f0a233d99969a0ff23ef6 (diff)
downloadbird-1a7a4e59a22f903a0be791f229e86ab881593851.tar
bird-1a7a4e59a22f903a0be791f229e86ab881593851.zip
Merge commit 'origin/master' into new
Diffstat (limited to 'conf')
-rw-r--r--conf/confbase.Y3
1 files changed, 2 insertions, 1 deletions
diff --git a/conf/confbase.Y b/conf/confbase.Y
index a2df85d..91bfb1d 100644
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -60,7 +60,8 @@ CF_DECLS
%type <t> text_or_none
%nonassoc PREFIX_DUMMY
-%nonassoc '=' '<' '>' '~' '.' GEQ LEQ NEQ AND OR PO PC
+%left AND OR
+%nonassoc '=' '<' '>' '~' '.' GEQ LEQ NEQ PO PC
%left '+' '-'
%left '*' '/' '%'
%left '!'