diff options
| author | Lars Ingebrigtsen | 2019-06-18 16:08:47 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2019-06-18 16:08:47 +0200 |
| commit | 4956e7610c782cace51943ee41f4c357703bdae1 (patch) | |
| tree | 3bb474932b696a8db3ecb4831ed55a2f25d0e115 /admin | |
| parent | f21ec24524c705e18674a2e9e4db37b11fa3ebab (diff) | |
| download | emacs-4956e7610c782cace51943ee41f4c357703bdae1.tar.gz emacs-4956e7610c782cace51943ee41f4c357703bdae1.zip | |
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.wy | 1 |
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 @@ | |||
| 88 | 88 | ||
| 89 | %package wisent-python-wy | 89 | %package wisent-python-wy |
| 90 | %provide semantic/wisent/python-wy | 90 | %provide semantic/wisent/python-wy |
| 91 | %expectedconflicts 4 | ||
| 92 | 91 | ||
| 93 | %{ | 92 | %{ |
| 94 | (declare-function wisent-python-reconstitute-function-tag | 93 | (declare-function wisent-python-reconstitute-function-tag |