Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary...

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

diff --git a/src/bin/test_table.c b/src/bin/test_table.c
index b67e78d..4033e82 100644 (file)
--- a/src/bin/test_table.c
+++ b/src/bin/test_table.c
@@ -366,8 +366,6 @@ test_table6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(win);
 }
 
-<<<<<<< HEAD
-=======
 void
 test_table7(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
@@ -433,5 +431,4 @@ test_table7(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(win);
 }
 
->>>>>>> remotes/origin/upstream
 #endif