Skip to content

Commit e3b1c7a

Browse files
author
MarcoFalke
committed
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
2 parents 38989ab + 3c6ef03 commit e3b1c7a

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@
5656
<ProjectReference Include="..\libsecp256k1\libsecp256k1.vcxproj">
5757
<Project>{bb493552-3b8c-4a8c-bf69-a6e7a51d2ea6}</Project>
5858
</ProjectReference>
59+
<ProjectReference Include="..\libleveldb\libleveldb.vcxproj">
60+
<Project>{18430fef-6b61-4c53-b396-718e02850f1b}</Project>
61+
</ProjectReference>
5962
</ItemGroup>
6063
<PropertyGroup Label="Globals">
6164
<VCProjectVersion>15.0</VCProjectVersion>

0 commit comments

Comments
 (0)