Merge e00ecb3 into merged_master (Bitcoin PR #16611)

8paa · Nov 9, 2020 · cd9e839 · cd9e839
2 parents adb6d02 + e00ecb3
commit cd9e839
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,6 +35,7 @@ libtool
 src/config/bitcoin-config.h
 src/config/bitcoin-config.h.in
 src/config/stamp-h1
+src/obj
 share/setup.nsi
 share/qt/Info.plist
 

diff --git a/src/obj/.gitignore b/src/obj/.gitignore