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

udpate table with Jazzy (backport #53) #56

Merged
merged 2 commits into from
Jul 1, 2024
Merged

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 1, 2024


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

Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
(cherry picked from commit fceb632)

# Conflicts:
#	README.md
@mergify mergify bot added the conflicts label Jul 1, 2024
Copy link
Author

mergify bot commented Jul 1, 2024

Cherry-pick of fceb632 has failed:

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

You are currently cherry-picking commit fceb632.
  (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:   README.md

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 Jul 1, 2024
Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
@ahcorde ahcorde merged commit 217ac91 into iron Jul 1, 2024
3 checks passed
@ahcorde ahcorde deleted the mergify/bp/iron/pr-53 branch July 1, 2024 07:53
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