IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2024-11-24 17:50:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge error.

Browse Source
This commit is contained in:
Dave Page 2014-03-09 14:39:12 +00:00
parent b022e5d347
commit 1db7d968e2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/pgAdmin4.cpp
View File

@ -95,8 +95,8 @@ int main(int argc, char * argv[])
return app.exec();
}
<<<<<<< HEAD
=======
// Ping the application server to see if it's alive
bool PingServer(QUrl url)
{
QNetworkAccessManager manager;
@ -136,4 +136,4 @@ bool PingServer(QUrl url)
return true;
}
>>>>>>> Have the runtime check in a loop to see if the app server is up before