migration merge<Jiyoun Park>

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

diff --git a/src/bin/test_photo.c b/src/bin/test_photo.c
index 8c2145f..79d9b3c 100644 (file)
--- a/src/bin/test_photo.c
+++ b/src/bin/test_photo.c
@@ -57,11 +57,7 @@ test_photo(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
                elm_photo_thumb_set(ph, buf, NULL);
              else
                elm_photo_file_set(ph, buf);
-<<<<<<< HEAD
-             elm_photo_editable_set(ph, 1);
-=======
              elm_photo_editable_set(ph, EINA_TRUE);
->>>>>>> remotes/origin/upstream
              evas_object_size_hint_weight_set(ph, EVAS_HINT_EXPAND,
                                               EVAS_HINT_EXPAND);
              evas_object_size_hint_align_set(ph, EVAS_HINT_FILL,