From 1db7d968e2a4feccda7cfba1bedbc8f94ad09a56 Mon Sep 17 00:00:00 2001
From: Dave Page <dpage@pgadmin.org>
Date: Sun, 9 Mar 2014 14:39:12 +0000
Subject: [PATCH] Fix merge error.

---
 runtime/pgAdmin4.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/runtime/pgAdmin4.cpp b/runtime/pgAdmin4.cpp
index b1b988896..f6d1d899e 100644
--- a/runtime/pgAdmin4.cpp
+++ b/runtime/pgAdmin4.cpp
@@ -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
+