Merge remote-tracking branch 'remotes/origin/upstream'

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

diff --git a/src/examples/calendar_example_05.c b/src/examples/calendar_example_05.c
index e48a9e8..21e1cb8 100644 (file)
--- a/src/examples/calendar_example_05.c
+++ b/src/examples/calendar_example_05.c
@@ -30,7 +30,11 @@ _print_cal_info_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info __U
 
    interval = elm_calendar_interval_get(obj);
    elm_calendar_min_max_year_get(obj, &year_min, &year_max);
+<<<<<<< HEAD
+   sel_enabled = elm_calendar_day_selection_enabled_get(obj);
+=======
    sel_enabled = !elm_calendar_day_selection_disabled_get(obj);
+>>>>>>> remotes/origin/upstream
    wds = elm_calendar_weekdays_names_get(obj);
 
    printf("Day: %i, Mon: %i, Year %i, WeekDay: %i<br>\n"