monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-23 12:09:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

resolve rebase conflict

Browse source
This commit is contained in:
Jaquee 2016-11-25 21:17:38 +01:00
parent 8dfa79ec58
commit 8361dda994
No known key found for this signature in database
GPG key ID: 384E52B09F45DC39
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
main.cpp
View file

@ -115,9 +115,6 @@ int main(int argc, char *argv[])
QObject::connect(&app, SIGNAL(aboutToQuit()), daemonManager, SLOT(closing())); QObject::connect(&app, SIGNAL(aboutToQuit()), daemonManager, SLOT(closing()));
engine.rootContext()->setContextProperty("daemonManager", daemonManager); engine.rootContext()->setContextProperty("daemonManager", daemonManager);
>>>>>>> cc05e1a... Shutdown daemon and close wallet properly on app exit
// export to QML monero accounts root directory // export to QML monero accounts root directory
// wizard is talking about where // wizard is talking about where
// to save the wallet file (.keys, .bin), they have to be user-accessible for // to save the wallet file (.keys, .bin), they have to be user-accessible for