src/bin src/edje_external conflict fixed

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

diff --git a/src/bin/test_eio.c b/src/bin/test_eio.c
index eae939c..865b912 100644 (file)
--- a/src/bin/test_eio.c
+++ b/src/bin/test_eio.c
@@ -37,8 +37,6 @@ _ls_filter_cb(void *data __UNUSED__, Eio_File *handler __UNUSED__, const char *f
   return EINA_TRUE;
 }
 
-<<<<<<< HEAD
-=======
 static int
 _compare_cb(const void *data1, const void *data2)
 {
@@ -48,7 +46,6 @@ _compare_cb(const void *data1, const void *data2)
                   elm_object_item_data_get(it2));
 }
 
->>>>>>> remotes/origin/upstream
 static void
 _ls_main_cb(void *data, Eio_File *handler __UNUSED__, const char *file)
 {
@@ -57,11 +54,7 @@ _ls_main_cb(void *data, Eio_File *handler __UNUSED__, const char *file)
                                   eina_stringshare_add(file),
                                   NULL,
                                   ELM_GENLIST_ITEM_NONE,
-<<<<<<< HEAD
-                                  (Eina_Compare_Cb) strcoll,
-=======
                                   _compare_cb,
->>>>>>> remotes/origin/upstream
                                   _sel_file,
                                   NULL);
 }