fixed bad automerge which caused a segfault

OpenFlipper.cc

@@ -493,23 +493,6 @@ int main(int argc, char **argv)
 
 #if QT_VERSION >= 0x050500
     
-    switch (parseCommandLine(parser, &errorMessage)) {
-      case CommandLineOk:
-        break;
-      case CommandLineError:
-        fputs(qPrintable(errorMessage), stderr);
-        fputs("\n\n", stderr);
-        fputs(qPrintable(parser.helpText()), stderr);
-        return 1;
-      case CommandLineVersionRequested:
-        printf("%s %s\n", qPrintable(QCoreApplication::applicationName()),
-            qPrintable(QCoreApplication::applicationVersion()));
-        return 0;
-      case CommandLineHelpRequested:
-        parser.showHelp();
-        Q_UNREACHABLE();
-    }
-    
 	QSurfaceFormat format;
     format.setVersion(4, 4);