Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-07 12:04:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove merge conflict comments

Browse source
This commit is contained in:
danteruiz 2019-09-19 10:40:16 -07:00
parent e21885905f
commit 82faeb70c8
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
launchers/qt/src/Helper.h
View file

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

2
launchers/qt/src/darwin/Helper.mm
View file

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