From bef8fdd6e2293efdaf05f804a8cff69380c8665e Mon Sep 17 00:00:00 2001 From: ken2812221 Date: Sat, 2 Feb 2019 05:58:56 +0800 Subject: msvc: Fix silent merge conflict between #13926 and #14372 --- build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj | 3 +++ 1 file changed, 3 insertions(+) (limited to 'build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj') diff --git a/build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj b/build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj index b618aca817..367e68ee51 100644 --- a/build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj +++ b/build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj @@ -53,6 +53,9 @@ {f91ac55e-6f5e-4c58-9ac5-b40db7deef93} + + {bb493552-3b8c-4a8c-bf69-a6e7a51d2ea6} + 15.0 -- cgit v1.2.3