Skip to content

Conversation

@hugovk
Copy link
Member

@hugovk hugovk commented Mar 21, 2024

  • Remove stray backtick from NEWS file

  • Remove more stray backticks from 3.12.0a1.rst

  • Remove another stray backtick in 3.13.0a1.rst (cherry picked from commit 02b6323)

The conflict was:

➤ Changes to be committed
#
#       modified:  [1] Misc/NEWS.d/3.12.0a1.rst
#       modified:  [2] Misc/NEWS.d/3.12.0b1.rst
#
➤ Unmerged paths
#
#       deleted by us:  [3] Misc/NEWS.d/3.13.0a1.rst
#

Resolved with git rm Misc/NEWS.d/3.13.0a1.rst.

* Remove stray backtick from NEWS file

* Remove more stray backticks from 3.12.0a1.rst

* Remove another stray backtick in 3.13.0a1.rst
(cherry picked from commit 02b6323)

Co-authored-by: Ezio Melotti <ezio.melotti@gmail.com>
@bedevere-app bedevere-app bot added skip issue skip news type-bug An unexpected behavior, bug, or error docs Documentation in the Doc dir labels Mar 21, 2024
@hugovk hugovk enabled auto-merge (squash) March 21, 2024 11:53
@hugovk hugovk merged commit ea290f8 into python:3.12 Mar 21, 2024
@hugovk hugovk deleted the backport-02b6323-3.12 branch March 21, 2024 11:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

docs Documentation in the Doc dir skip issue skip news type-bug An unexpected behavior, bug, or error

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants