3d, gesturelayer, index, naviframe, transit, fileselector, frame, glview, layout...

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

diff --git a/src/bin/test_3d.c b/src/bin/test_3d.c
index 235309d..17b880b 100644 (file)
--- a/src/bin/test_3d.c
+++ b/src/bin/test_3d.c
@@ -1,8 +1,5 @@
 #include <Elementary.h>
-<<<<<<< HEAD
-=======
 #include "test.h"
->>>>>>> remotes/origin/upstream
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
@@ -245,13 +242,8 @@ test_3d(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __U
 {
    Evas_Object *win, *bg, *bx, *sl;
 
-<<<<<<< HEAD
-   win = elm_win_add(NULL, "3d", ELM_WIN_BASIC);
-   elm_win_title_set(win, "3D");
-=======
    win = elm_win_add(NULL, "box-vert", ELM_WIN_BASIC);
    elm_win_title_set(win, "Box Vert");
->>>>>>> remotes/origin/upstream
    elm_win_autodel_set(win, EINA_TRUE);
 
    bg = elm_bg_add(win);