src/bin src/edje_external conflict fixed

[framework/uifw/elementary.git] / src / edje_externals / elm_video.c

diff --git a/src/edje_externals/elm_video.c b/src/edje_externals/elm_video.c
index 10be0ad..e869afe 100644 (file)
--- a/src/edje_externals/elm_video.c
+++ b/src/edje_externals/elm_video.c
@@ -31,11 +31,7 @@ external_video_state_set(void *data __UNUSED__, Evas_Object *obj, const void *fr
    else return;
 
    if (p->file) elm_video_file_set(obj, p->file);
-<<<<<<< HEAD
-   if (p->uri) elm_video_uri_set(obj, p->uri);
-=======
    if (p->uri) elm_video_file_set(obj, p->uri);
->>>>>>> remotes/origin/upstream
    if (p->play_exists && p->play) elm_video_play(obj);
    if (p->pause_exists && p->pause) elm_video_pause(obj);
    if (p->stop_exists && p->stop) elm_video_stop(obj);
@@ -59,11 +55,7 @@ external_video_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ext
    else if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
        && (!strcmp(param->name, "uri")))
      {
-<<<<<<< HEAD
-        elm_video_uri_set(obj, param->s);
-=======
         elm_video_file_set(obj, param->s);
->>>>>>> remotes/origin/upstream
         return EINA_TRUE;
      }
    else if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)