Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

fix: land program addresses off-curve (bp #11355)#11413

Closed
mergify[bot] wants to merge 1 commit intov1.2from
mergify/bp/v1.2/pr-11355
Closed

fix: land program addresses off-curve (bp #11355)#11413
mergify[bot] wants to merge 1 commit intov1.2from
mergify/bp/v1.2/pr-11355

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Aug 6, 2020

This is an automated backport of pull request #11355 done by Mergify

Cherry-pick of 5c4b815 has failed:

On branch mergify/bp/v1.2/pr-11355
Your branch is up to date with 'origin/v1.2'.

You are currently cherry-picking commit 5c4b8153c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)

	deleted by us:   web3.js/module.flow.js
	deleted by us:   web3.js/src/publickey.js
	deleted by us:   web3.js/test/publickey.test.js

no changes added to commit (use "git add" and/or "git commit -a")

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the simulator.

Finally, you can contact us on https://mergify.io/

(cherry picked from commit 5c4b815)

# Conflicts:
#	web3.js/module.flow.js
#	web3.js/src/publickey.js
#	web3.js/test/publickey.test.js
@mergify mergify Bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Aug 6, 2020
@jackcmay jackcmay closed this Aug 6, 2020
@jackcmay
Copy link
Copy Markdown
Contributor

jackcmay commented Aug 6, 2020

No web3 on v1.2

@jackcmay jackcmay deleted the mergify/bp/v1.2/pr-11355 branch August 6, 2020 14:54
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

automerge Merge this Pull Request automatically once CI passes conflicts

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant