From 868610c7781efd6b3329cc0e0c44b7694759c11b Mon Sep 17 00:00:00 2001
From: Jacob Brydolf <jacob@brydolf.net>
Date: Fri, 7 Oct 2016 16:44:20 +0200
Subject: [PATCH] fix conflict

---
 main.qml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/main.qml b/main.qml
index a87def23..cf223bd5 100644
--- 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