3d, gesturelayer, index, naviframe, transit, fileselector, frame, glview, layout...

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

diff --git a/src/edje_externals/elm_index.c b/src/edje_externals/elm_index.c
index eccb991..b516602 100644 (file)
--- a/src/edje_externals/elm_index.c
+++ b/src/edje_externals/elm_index.c
@@ -18,11 +18,7 @@ external_index_state_set(void *data __UNUSED__, Evas_Object *obj, const void *fr
    else return;
 
    if (p->active_exists)
-<<<<<<< HEAD
-     elm_index_active_set(obj, p->active_exists);
-=======
      elm_index_autohide_disabled_set(obj, p->active_exists);
->>>>>>> remotes/origin/upstream
 }
 
 static Eina_Bool
@@ -32,11 +28,7 @@ external_index_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ext
      {
         if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
           {
-<<<<<<< HEAD
-             elm_index_active_set(obj, param->i);
-=======
              elm_index_autohide_disabled_set(obj, param->i);
->>>>>>> remotes/origin/upstream
              return EINA_TRUE;
           }
      }
@@ -53,11 +45,7 @@ external_index_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ext
      {
         if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
           {
-<<<<<<< HEAD
-             param->i = elm_index_active_get(obj);
-=======
              param->i = elm_index_autohide_disabled_get(obj);
->>>>>>> remotes/origin/upstream
              return EINA_TRUE;
           }
      }