From 82faeb70c8e4ca1aedb2faa7fd02e068bb0b5d69 Mon Sep 17 00:00:00 2001
From: danteruiz <danteruiz102@gmail.com>
Date: Thu, 19 Sep 2019 10:40:16 -0700
Subject: [PATCH] remove merge conflict comments

---
 launchers/qt/src/Helper.h         | 4 ----
 launchers/qt/src/darwin/Helper.mm | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/launchers/qt/src/Helper.h b/launchers/qt/src/Helper.h
index 347f4888e5..7d1f54a949 100644
--- a/launchers/qt/src/Helper.h
+++ b/launchers/qt/src/Helper.h
@@ -2,10 +2,7 @@
 #include <string>
 
 void launchClient(const QString& clientPath, const QString& homePath, const QString& defaultScriptOverride,
-<<<<<<< HEAD
                   const QString& displayName, const QString& contentCachePath, QString loginResponseToken = QString());
-=======
-                  const QString& displayName, const QString& contentCachePath, const QString& loginResponseToken = QString());
 
 
 void launchAutoUpdater(const QString& autoUpdaterPath);
@@ -14,4 +11,3 @@ void swapLaunchers(const QString& oldLauncherPath = QString(), const QString& ne
 #ifdef Q_OS_MAC
 bool replaceDirectory(const QString& orginalDirectory, const QString& newDirectory);
 #endif
->>>>>>> 09b9b1e10cae3dfc901d48c5af8f0b6f486cbbda
diff --git a/launchers/qt/src/darwin/Helper.mm b/launchers/qt/src/darwin/Helper.mm
index 5f4d875c82..47bdcb2814 100644
--- a/launchers/qt/src/darwin/Helper.mm
+++ b/launchers/qt/src/darwin/Helper.mm
@@ -7,7 +7,7 @@
 #include <QDebug>
 
 void launchClient(const QString& clientPath, const QString& homePath, const QString& defaultScriptOverride,
-                  const QString& displayName, const QString& contentCachePath, const QString& loginTokenResponse) {
+                  const QString& displayName, const QString& contentCachePath, QString& loginTokenResponse) {
 
     NSString* homeBookmark = [[NSString stringWithFormat:@"hqhome="] stringByAppendingString:homePath.toNSString()];
     NSArray* arguments;