You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
minor #14723 Remove merge conflict header (GawainLynch)
This PR was submitted for the 5.x branch but it was merged into the 5.2 branch instead.
Discussion
----------
Remove merge conflict header
Spotted this on the Sphinx fail from my last PR
Commits
-------
63a4e50 Remove merge conflict header
0 commit comments