diff options
| author | Hannah von Reth <hannah.vonreth@owncloud.com> | 2022-11-11 21:11:26 +0300 |
|---|---|---|
| committer | Hannah von Reth <hannah.vonreth@owncloud.com> | 2022-11-11 21:11:26 +0300 |
| commit | bb2251efdeba7a37f9f305f134e3cfc80b94b5ca (patch) | |
| tree | 90e3a25d561dbc4ecb807efa62908043824ceb9b | |
| parent | 6c5bef20aabdfd13c23d61616598ff5475dfc090 (diff) | |
| -rw-r--r-- | src/cmd/cmd.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/cmd/cmd.cpp b/src/cmd/cmd.cpp index cb2519946..c5ae7bf5a 100644 --- a/src/cmd/cmd.cpp +++ b/src/cmd/cmd.cpp @@ -415,10 +415,6 @@ CmdOptions parseOptions(const QStringList &app_args) int main(int argc, char **argv) { -<<<<<<< HEAD - QCoreApplication app(argc, argv); - app.setApplicationVersion(Theme::instance()->versionSwitchOutput()); -======= auto platform = OCC::Platform::create(); QCoreApplication app(argc, argv); @@ -427,7 +423,6 @@ int main(int argc, char **argv) platform->migrate(); platform->setApplication(&app); ->>>>>>> origin/3.0 SyncCTX ctx { parseOptions(app.arguments()) }; |