resolve rebase conflict

pull/2/head
Jaquee 8 years ago
parent 8dfa79ec58
commit 8361dda994
No known key found for this signature in database
GPG Key ID: 384E52B09F45DC39

@ -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