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

[framework/uifw/elementary.git] / doc / widgets / widget_preview_index.c

diff --git a/doc/widgets/widget_preview_index.c b/doc/widgets/widget_preview_index.c
index 4b3246a..3e655ce 100644 (file)
--- a/doc/widgets/widget_preview_index.c
+++ b/doc/widgets/widget_preview_index.c
@@ -33,16 +33,9 @@ for (i = 0; i < (sizeof(dict) / sizeof(dict[0])); i++)
 
      list_it = elm_list_item_append(o, dict[i], NULL, NULL, NULL, NULL);
      snprintf(buf, sizeof(buf), "%c", dict[i][0]);
-<<<<<<< HEAD
-     elm_index_item_append(id, buf, list_it);
-  }
-
-elm_index_active_set(id, EINA_TRUE);
-=======
      elm_index_item_append(id, buf, NULL, list_it);
   }
 
 elm_index_autohide_disabled_set(id, EINA_FALSE);
->>>>>>> remotes/origin/upstream
 
 #include "widget_preview_tmpl_foot.c"