migration merge<Jiyoun Park>

[framework/uifw/elementary.git] / src / examples / photocam_example_01.c

diff --git a/src/examples/photocam_example_01.c b/src/examples/photocam_example_01.c
index b1c6148..a2ba742 100644 (file)
--- a/src/examples/photocam_example_01.c
+++ b/src/examples/photocam_example_01.c
@@ -74,11 +74,7 @@ static void
 _fit(void *data, Evas_Object *obj, void *event_info)
 {
    int x, y, w, h;
-<<<<<<< HEAD
-   elm_photocam_region_get(data, &x, &y, &w, &h);
-=======
    elm_photocam_image_region_get(data, &x, &y, &w, &h);
->>>>>>> remotes/origin/upstream
    printf("region: {%d, %d, %d, %d}\n", x, y, w, h);
    elm_photocam_zoom_mode_set(data, ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT);
 }