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: nil check in post (backport #118) #119

Merged
merged 4 commits into from
Jun 13, 2024
Merged

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 13, 2024

Closes #114
Closes #115


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

* fix

* fix with check

* add early exit

* fix

(cherry picked from commit f0997fb)

# Conflicts:
#	x/feemarket/post/fee.go
#	x/feemarket/post/fee_test.go
@mergify mergify bot requested a review from davidterpay as a code owner June 13, 2024 13:59
@mergify mergify bot added the conflicts label Jun 13, 2024
Copy link
Author

mergify bot commented Jun 13, 2024

Cherry-pick of f0997fb has failed:

On branch mergify/bp/sdk-47/pr-118
Your branch is up to date with 'origin/sdk-47'.

You are currently cherry-picking commit f0997fb.
  (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)

Changes to be committed:
	modified:   docs/INTEGRATIONS.md
	modified:   x/feemarket/ante/fee.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x/feemarket/post/fee.go
	both modified:   x/feemarket/post/fee_test.go

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

aljo242 added 3 commits June 13, 2024 10:09
@aljo242 aljo242 merged commit dbc959b into sdk-47 Jun 13, 2024
8 checks passed
@aljo242 aljo242 deleted the mergify/bp/sdk-47/pr-118 branch June 13, 2024 15:20
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