Skip to content

Update Erlang.mk (MERGE IF GREEN) (backport #13580) #13832

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

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 30, 2025

Contains fix for asdf.


This is an automatic backport of pull request #13580 done by Mergify.

(cherry picked from commit b34a722)

# Conflicts:
#	erlang.mk
@mergify mergify bot added the conflicts label Apr 30, 2025
Copy link
Author

mergify bot commented Apr 30, 2025

Cherry-pick of b34a722 has failed:

On branch mergify/bp/v4.0.x/pr-13580
Your branch is up to date with 'origin/v4.0.x'.

You are currently cherry-picking commit b34a7227b.
  (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:   erlang.mk

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

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.

2 participants