summaryrefslogtreecommitdiff
path: root/admin
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2019-06-18 16:08:47 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2019-06-18 16:08:47 +0200
commit4956e7610c782cace51943ee41f4c357703bdae1 (patch)
tree3bb474932b696a8db3ecb4831ed55a2f25d0e115 /admin
parentf21ec24524c705e18674a2e9e4db37b11fa3ebab (diff)
downloademacs-4956e7610c782cace51943ee41f4c357703bdae1.tar.gz
Revert "Add a mechanism to specify expected shift/reduce .wy conflicts"
This reverts commit f21ec24524c705e18674a2e9e4db37b11fa3ebab. *sigh* Revert again because this created a bootstrap problem in a different part of the process.
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