summaryrefslogtreecommitdiff
path: root/admin
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2019-06-18 15:59:16 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2019-06-18 15:59:16 +0200
commit90b44f336caf7d70721f44ac2497a38ff69d6c7d (patch)
tree3bb474932b696a8db3ecb4831ed55a2f25d0e115 /admin
parentd715ae8788e16b22f7f68cb82b51a40ad95c78c2 (diff)
downloademacs-90b44f336caf7d70721f44ac2497a38ff69d6c7d.tar.gz
Revert "Add a mechanism to specify expected shift/reduce .wy conflicts"
This reverts commit d715ae8788e16b22f7f68cb82b51a40ad95c78c2. This commit led to a build error, so revert for now.
Diffstat (limited to 'admin')
-rw-r--r--admin/grammars/python.wy1
1 files changed, 0 insertions, 1 deletions
diff --git a/admin/grammars/python.wy b/admin/grammars/python.wy
index 0e926ad3636..082850df59c 100644
--- a/admin/grammars/python.wy
+++ b/admin/grammars/python.wy
@@ -88,7 +88,6 @@
%package wisent-python-wy
%provide semantic/wisent/python-wy
-%expectedconflicts 4
%{
(declare-function wisent-python-reconstitute-function-tag