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

[framework/uifw/elementary.git] / src / lib / elm_photo.c

diff --git a/src/lib/elm_photo.c b/src/lib/elm_photo.c
index 001d59e..13f760c 100644 (file)
--- a/src/lib/elm_photo.c
+++ b/src/lib/elm_photo.c
@@ -591,7 +591,11 @@ elm_photo_thumb_set(const Evas_Object *obj, const char *file, const char *group)
    eina_stringshare_replace(&wd->thumb.file.path, file);
    eina_stringshare_replace(&wd->thumb.file.key, group);
 
+<<<<<<< HEAD
+   if (elm_thumb_ethumb_client_connected())
+=======
    if (elm_thumb_ethumb_client_connected_get())
+>>>>>>> remotes/origin/upstream
      {
         _icon_thumb_apply(wd);
         return ;