Skip to content

Commit

Permalink
msvc: Fix silent merge conflict between #13926 and #14372 part II
Browse files Browse the repository at this point in the history
  • Loading branch information
ken2812221 committed Feb 14, 2019
1 parent 6f4e0d1 commit 3c6ef03
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 3c6ef03

Please sign in to comment.