diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-02-14 08:58:44 -0500 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-02-14 08:58:46 -0500 |
| commit | e3b1c7a9d6aefcf5c6022dde6956aec6cbc7f205 (patch) | |
| tree | 8239e156b0c9c1c6a892472f744cbf1aafc8d347 /share | |
| parent | 38989ab03fb74ad56c1018c37cb24d17cbb3a16f (diff) | |
| parent | 3c6ef0393ff72a6105e3e40e2db8b355945584ab (diff) | |
| download | bitcoin-e3b1c7a9d6aefcf5c6022dde6956aec6cbc7f205.tar.xz | |
Merge #15407: msvc: Fix silent merge conflict between #13926 and #14372 part II
3c6ef0393f 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
Diffstat (limited to 'share')
0 files changed, 0 insertions, 0 deletions