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 gas_used deserialization (backport #2158) #2159

Merged
merged 4 commits into from
May 30, 2024
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 30, 2024


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

(cherry picked from commit 9bdf442)
(cherry picked from commit aa1a7f2)
@mergify mergify bot added the conflicts label May 30, 2024
Copy link
Contributor Author

mergify bot commented May 30, 2024

Cherry-pick of 6e89163 has failed:

On branch mergify/bp/main/pr-2158
Your branch is ahead of 'origin/main' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 6e891634b.
  (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:   CHANGELOG.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 May 30, 2024
(cherry picked from commit 6e89163)

# Conflicts:
#	CHANGELOG.md
@chipshort chipshort merged commit 9cd3350 into main May 30, 2024
29 of 31 checks passed
@chipshort chipshort deleted the mergify/bp/main/pr-2158 branch May 30, 2024 11: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