diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2020-11-12 02:50:43 +0900 |
|---|---|---|
| committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2020-11-12 02:50:43 +0900 |
| commit | 279e547860ea68e3c357f55e608afec682a1f961 (patch) | |
| tree | dc08e85ab0210538e30b5b801bf9d80ab49bfb3f /sphinx/testing/fixtures.py | |
| parent | 859b5fcea71f8d4f46e0ef3726e68df54bfbc3b7 (diff) | |
| parent | 64fb1e56242d93ee0e8c317ab9e7643242b99658 (diff) | |
| download | sphinx-git-279e547860ea68e3c357f55e608afec682a1f961.tar.gz | |
Merge branch '3.x'
Diffstat (limited to 'sphinx/testing/fixtures.py')
| -rw-r--r-- | sphinx/testing/fixtures.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sphinx/testing/fixtures.py b/sphinx/testing/fixtures.py index 55e639df6..1008ea1b8 100644 --- a/sphinx/testing/fixtures.py +++ b/sphinx/testing/fixtures.py @@ -20,7 +20,6 @@ import pytest from sphinx.testing import util from sphinx.testing.util import SphinxTestApp, SphinxTestAppWrapperForSkipBuilding - DEFAULT_ENABLED_MARKERS = [ ( 'sphinx(builder, testroot=None, freshenv=False, confoverrides=None, tags=None,' |