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

msvc: Fix silent merge conflict between #13926 and #14372 part II #15407

Merged
merged 1 commit into from Feb 14, 2019

Conversation

Projects
None yet
4 participants
@ken2812221
Copy link
Member

commented Feb 14, 2019

In #15325, I added secp256k1 as a dependency of bitcoin-wallet. However, I didn't notice that leveldb is also a dependency of it.

@fanquake

This comment has been minimized.

Copy link
Member

commented Feb 14, 2019

utACK 3c6ef03

@MarcoFalke MarcoFalke merged commit 3c6ef03 into bitcoin:master Feb 14, 2019

2 checks passed

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

MarcoFalke added a commit that referenced this pull request Feb 14, 2019

Merge #15407: msvc: Fix silent merge conflict between #13926 and #14372
… part II

3c6ef03 msvc: Fix silent merge conflict between #13926 and #14372 part II (Chun Kuan Lee)

Pull request description:

  In #15325, I added secp256k1 as a dependency of bitcoin-wallet. However, I didn't notice that leveldb is also a dependency of it.

Tree-SHA512: dc29b5cad6c529dd9517d6c2cbbe5297b69e73303e2fbbcd4b4842c9c5b51a4332df5a4bf3b82cd3ed2c1668cc95f8c9636f9485af0d722fed9c1319da3cc2e2

@ken2812221 ken2812221 deleted the ken2812221:msvc-bitcoin-wallet-leveldb branch Feb 14, 2019

@MarcoFalke

This comment has been minimized.

Copy link
Member

commented Feb 14, 2019

Thanks, I am just going to merge this, since appveyor passed on this pull request.

@laanwj

This comment has been minimized.

Copy link
Member

commented Feb 17, 2019

In #15325, I added secp256k1 as a dependency of bitcoin-wallet. However, I didn't notice that leveldb is also a dependency of it.

This is probably something we need to fix in the future, there's afaik no architectural reason for the wallet to depend on leveldb.

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.