Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'main' into old-index-directives/keyword
# Conflicts:
#	Doc/tools/extensions/pyspecific.py
  • Loading branch information
AA-Turner committed May 4, 2023
commit bbeffaff7c4f10ed763542eb24a4c17781050422
2 changes: 1 addition & 1 deletion Doc/tools/extensions/pyspecific.py
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,7 @@ def patch_pairindextypes(app) -> None:
# away from this, we need Sphinx to believe that these values don't
# exist, by deleting them when using the gettext builder.

# pairindextypes.pop('module', None)
pairindextypes.pop('module', None)
pairindextypes.pop('keyword', None)
# pairindextypes.pop('operator', None)
# pairindextypes.pop('object', None)
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.