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 iron (backport #734) #736

Closed
wants to merge 1 commit into from
Closed

Fix iron (backport #734) #736

wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 27, 2024


This is an automatic backport of pull request #734 done by [Mergify](https://mergify.com).

(cherry picked from commit 6c040e3)

# Conflicts:
#	config/freertos/esp32/create.sh
@mergify mergify bot added the conflicts label Sep 27, 2024
Copy link
Contributor Author

mergify bot commented Sep 27, 2024

Cherry-pick of 6c040e3 has failed:

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

You are currently cherry-picking commit 6c040e3.
  (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:   config/freertos/esp32/create.sh

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 Sep 27, 2024
@pablogs9 pablogs9 closed this Sep 27, 2024
@pablogs9 pablogs9 deleted the mergify/bp/jazzy/pr-734 branch September 27, 2024 07:47
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