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

Update licence list (backport #9837) #9873

Closed
wants to merge 1 commit into from
Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 9, 2024

Per https://github.com/haskell/cabal/wiki/Updating-the-license-list to version 3.23 (2024-02-08) of SPDX License List.
Forward-port of #9818


Include the following checklist in your PR:

Per https://github.com/haskell/cabal/wiki/Updating-the-license-list
to version 3.23 (2024-02-08) of SPDX License List.

(cherry picked from commit d0ec5d6)

# Conflicts:
#	license-list-data/exceptions-3.23.json
#	license-list-data/licenses-3.23.json
@mergify mergify bot added the conflicts label Apr 9, 2024
Copy link
Contributor Author

mergify bot commented Apr 9, 2024

Cherry-pick of d0ec5d6 has failed:

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

You are currently cherry-picking commit d0ec5d6ce.
  (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 added:      license-list-data/exceptions-3.23.json
	both added:      license-list-data/licenses-3.23.json

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 Apr 9, 2024
5 tasks
@mergify mergify bot added the backport label Apr 9, 2024
@ffaf1 ffaf1 closed this Apr 9, 2024
@mergify mergify bot deleted the mergify/bp/3.12/pr-9837 branch April 9, 2024 15:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant