Shift/reduce conflict goes away _and_ if/then/else works.

diff --git a/filter/config.Y b/filter/config.Y
index 54aeb69d8ad3f998ab414ea25f4f949a692ca7a1..5c8977cfeb684f6ff32cc3bd7f319981532e7594 100644 (file)
--- 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