Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typo (backport #9770) #10001

Closed
wants to merge 2 commits into from
Closed

Fix typo (backport #9770) #10001

wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 13, 2024

Missing full stop.


  • Patches conform to the coding conventions.
  • [ ] Any changes that could be relevant to users have been recorded in the changelog. not present in 3.10, so I would say a changelog entry is not needed.
  • The documentation has been updated, if necessary.
  • Manual QA notes have been included.
  • [ ] Tests have been added. (Ask for help if you don’t know how to write them! Ask for an exemption if tests are too complex for too little coverage!) one-liner, not needed
    This is an automatic backport of pull request Fix typo #9770 done by Mergify.

Missing full stop.

(cherry picked from commit 6bad26a)

# Conflicts:
#	cabal-install/src/Distribution/Client/Setup.hs
@mergify mergify bot added the conflicts label May 13, 2024
Copy link
Contributor Author

mergify bot commented May 13, 2024

Cherry-pick of 6bad26a has failed:

On branch mergify/bp/3.12/pr-9770
Your branch is up to date with 'origin/3.12'.

You are currently cherry-picking commit 6bad26a2d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   cabal-install/src/Distribution/Client/Setup.hs

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request May 13, 2024
3 tasks
@mergify mergify bot added the backport label May 13, 2024
@ulysses4ever
Copy link
Collaborator

This one is not needed. 3.12 had a backport of #9583 (see #9893), and it supersedes this one.

@mergify mergify bot deleted the mergify/bp/3.12/pr-9770 branch May 13, 2024 17:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants