From: Pasi Kallinen <paxed@alt.org>
Date: Mon, 3 Oct 2011 14:50:35 +0000 (+0000)
Subject: Fix watch_columns shift/reduce conflict: watch_columns was being used in both a stand... 
X-Git-Tag: v1.6.1-roc-dev~116
X-Git-Url: https://skyeroc.xyz/gitweb/?a=commitdiff_plain;h=e2af2199f444c4c17e45d42e51c4185c5862c15f;p=dgamelaunch

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
---

diff --git a/config.y b/config.y
index 0350840..935e796 100644
--- 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; }
 	;