From 4ed8718a19747bba95ff86fb8d3c6ea357b50101 Mon Sep 17 00:00:00 2001
From: Pavel Machek <pavel@ucw.cz>
Date: Thu, 11 Nov 1999 13:27:59 +0000
Subject: [PATCH] Shift/reduce conflict goes away _and_ if/then/else works.

---
 filter/config.Y | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/filter/config.Y b/filter/config.Y
index 54aeb69d..5c8977cf 100644
--- a/filter/config.Y
+++ b/filter/config.Y
@@ -38,10 +38,8 @@ CF_KEYWORDS(FUNCTION, PRINT, PRINTN, CONST,
 	FILTER
 	)
 
-/* Add these to break parser and make shift/reduce conflict go away :-(
-%nonassoc ELSE
 %nonassoc THEN
-*/
+%nonassoc ELSE
 
 %type <x> term block cmds cmd function_body constant print_one print_list var_list var_listn any_dynamic enums
 %type <f> filter filter_body