Fix merge conflict

[electrum-nvc.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index df26565..fc596d3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@ lib/icons_rc.py
 build/
 dist/
 *.egg/
-/electrum.py
\ No newline at end of file
+/electrum.py
+contrib/pyinstaller/