From 32ada7c4adb37ebb82005f024d25cae129904df3 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Fri, 3 Feb 2012 17:30:16 +0100
Subject: fix merge error

---
 src/fbgui/main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/fbgui/main.cpp b/src/fbgui/main.cpp
index c83dbdc..197ba68 100644
--- a/src/fbgui/main.cpp
+++ b/src/fbgui/main.cpp
@@ -94,7 +94,7 @@ int main(int argc, char *argv[]) {
 	// parse command line arguments using getopt
 	QMap<QString, QString> clOpts;
 	int longIndex = 0;
-   static const char *optString = "c:u:d:s:t:D:hl:nS:p:e:x";
+        static const char *optString = "c:u:d:s:t:D:hl:nS:p:e:x";
 	static const struct option longOpts[] = { { "config", required_argument,
 			NULL, 'c' }, { "url", required_argument, NULL, 'u' }, { "download",
 			required_argument, NULL, 'd' }, { "serial", required_argument, NULL,
@@ -104,7 +104,7 @@ int main(int argc, char *argv[]) {
 					'n' }, { "server", required_argument, NULL, 'S' }, {
 					"autoup", no_argument, NULL, 'a' }, { "socketserverpath",
 					required_argument, NULL, 'p' }, { "pathtoexe",
-               "pathtoexe", required_argument, NULL, 'e' }, { "ssl", no_argument, NULL, 'x' } };
+               required_argument, NULL, 'e' }, { "ssl", no_argument, NULL, 'x' } };
 	int opt = getopt_long(argc, argv, optString, longOpts, &longIndex);
 	while (opt != -1) {
 		switch (opt) {
-- 
cgit v1.2.3-55-g7522