ui: remove local change that is applied upstream
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Fri, 8 Jul 2016 11:38:00 +0000 (20:38 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Fri, 8 Jul 2016 11:38:00 +0000 (20:38 +0900)
Change-Id: Ia9d027c2f4d28f8725601a94c55a90f658582538
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
ui/cocoa.m

index abb0906..97426ba 100644 (file)
@@ -1170,11 +1170,6 @@ int main (int argc, const char * argv[]) {
                 opt++;
             }
             if (!strcmp(opt, "-h") || !strcmp(opt, "-help") ||
-#ifdef CONFIG_MARU
-                // XXX: we assume that a user do not want to use cocoa UI
-                // if -display is specified
-                !strcmp(opt, "-display") ||
-#endif
                 !strcmp(opt, "-vnc") ||
                 !strcmp(opt, "-nographic") ||
                 !strcmp(opt, "-version") ||