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

qa: Fix silent merge conflict in wallet_importmulti #14189

Merged
merged 1 commit into from Sep 10, 2018

Conversation

Projects
None yet
2 participants
@MarcoFalke
Copy link
Member

commented Sep 10, 2018

Fixup to 13c842e

MarcoFalke added a commit to MarcoFalke/bitcoin that referenced this pull request Sep 10, 2018

Merge bitcoin#14189: qa: Fix silent merge conflict in wallet_importmulti
fa263bc qa: Fix silent merge conflict in wallet_importmulti (MarcoFalke)

Pull request description:

  Fixup to 13c842e

Tree-SHA512: 622616d5259cc639f6a8709c80c1f21abb8b21470412cbe3904c5e63c3c3b55a4472a37d7ae579a7f1d1af10bccb8a187dd9957d00975d10854047f7650bde76

@MarcoFalke MarcoFalke merged commit fa263bc into bitcoin:master Sep 10, 2018

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@MarcoFalke MarcoFalke deleted the MarcoFalke:Mf1809-qaMergeconflict branch Sep 10, 2018

@fanquake

This comment has been minimized.

Copy link
Member

commented Sep 11, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.