From 8361dda994b35803fbfc5bfdced262c4f6f30be2 Mon Sep 17 00:00:00 2001 From: Jaquee Date: Fri, 25 Nov 2016 21:17:38 +0100 Subject: [PATCH] resolve rebase conflict --- main.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/main.cpp b/main.cpp index ebae384f..4bc71a53 100644 --- a/main.cpp +++ b/main.cpp @@ -115,9 +115,6 @@ int main(int argc, char *argv[]) QObject::connect(&app, SIGNAL(aboutToQuit()), daemonManager, SLOT(closing())); engine.rootContext()->setContextProperty("daemonManager", daemonManager); - ->>>>>>> cc05e1a... Shutdown daemon and close wallet properly on app exit - // export to QML monero accounts root directory // wizard is talking about where // to save the wallet file (.keys, .bin), they have to be user-accessible for