src/bin src/edje_external conflict fixed

[framework/uifw/elementary.git] / src / bin / quicklaunch.c

diff --git a/src/bin/quicklaunch.c b/src/bin/quicklaunch.c
index e5bae99..c9e6de9 100644 (file)
--- a/src/bin/quicklaunch.c
+++ b/src/bin/quicklaunch.c
@@ -266,18 +266,11 @@ main(int argc, char **argv)
        struct sockaddr_un client;
        socklen_t len;
 
-<<<<<<< HEAD
-       elm_quicklaunch_sub_init(argc, argv);
-       elm_quicklaunch_seed();
-       len = sizeof(struct sockaddr_un);
-       fd = accept(sock, (struct sockaddr *)&client, &len);
-=======
        len = sizeof(struct sockaddr_un);
        fd = accept(sock, (struct sockaddr *)&client, &len);
        elm_quicklaunch_sub_init(argc, argv);
 // don't seed since we are doing this AFTER launch request        
 //     elm_quicklaunch_seed();
->>>>>>> remotes/origin/upstream
        if (fd >= 0)
          {
             unsigned long bytes;