Skip to content

Commit

Permalink
Merge #15407: msvc: Fix silent merge conflict between #13926 and #143…
Browse files Browse the repository at this point in the history
…72 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
  • Loading branch information
MarcoFalke committed Feb 14, 2019
2 parents 38989ab + 3c6ef03 commit e3b1c7a
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@
<ProjectReference Include="..\libsecp256k1\libsecp256k1.vcxproj">
<Project>{bb493552-3b8c-4a8c-bf69-a6e7a51d2ea6}</Project>
</ProjectReference>
<ProjectReference Include="..\libleveldb\libleveldb.vcxproj">
<Project>{18430fef-6b61-4c53-b396-718e02850f1b}</Project>
</ProjectReference>
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>15.0</VCProjectVersion>
Expand Down

0 comments on commit e3b1c7a

Please sign in to comment.