fix conflict

2016-10-07 16:44:20 +02:00
parent 49018390dc
commit 868610c778
1 changed files with 0 additions and 1 deletions
--- a/main.qml
+++ b/main.qml
@@ -55,7 +55,6 @@ ApplicationWindow {
    property alias password : passwordDialog.password
    property int splashCounter: 0
    property bool isNewWallet: false
-
    // true if wallet ever synchronized
    property bool walletInitialized : false