Fix watch_columns shift/reduce conflict: watch_columns was being used in both a standalone rule and as a KeyType. (Darshan Shaligram <scintilla@gmail.com>)

git-svn-id: svn://katsu.triplehelix.org/dgamelaunch/trunk@594 db0b04b0-f4d1-0310-9a6d-de3e77497b0e
This commit is contained in:
Pasi Kallinen 2011-10-03 14:50:35 +00:00
parent 6439b5788b
commit e2af2199f4
1 changed files with 0 additions and 1 deletions

View File

@ -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; }
;