Fix watch_columns shift/reduce conflict: watch_columns was being used in both a stand...

git-svn-id: svn://katsu.triplehelix.org/dgamelaunch/trunk@594 db0b04b0-f4d1-0310-9a6d-de3e77497b0e

diff --git a/config.y b/config.y
index 0350840cc3acdfa554f5c3868e55687f2f8aaaa4..935e796edb7d645517f81752e8b49cdc8ef93949 100644 (file)
--- a/config.y
+++ b/config.y
@@ -606,7 +606,6 @@ KeyType : TYPE_SUSER        { $$ = TYPE_SUSER; }
        | TYPE_PATH_INPROGRESS  { $$ = TYPE_PATH_INPROGRESS; }
        | TYPE_RC_FMT           { $$ = TYPE_RC_FMT; }
        | TYPE_WATCH_SORTMODE   { $$ = TYPE_WATCH_SORTMODE; }
-       | TYPE_WATCH_COLUMNS    { $$ = TYPE_WATCH_COLUMNS; }
        | TYPE_SERVER_ID        { $$ = TYPE_SERVER_ID; }
        ;