Fix merge conflict

2013-03-16 21:38:12 +01:00
parent 1cda13a407 070d497afb
commit dfd48319a3
28 changed files with 881 additions and 698 deletions
@@ -4,4 +4,5 @@ lib/icons_rc.py
 build/
 dist/
 *.egg/
-/electrum.py
+/electrum.py
+contrib/pyinstaller/