Resolve the conflicts

Change-Id: I84d35fffb84525a89e672754635a524377684588

diff --git a/src/lib/elm_genlist.eo b/src/lib/elm_genlist.eo
index 5b90cd908dd65faae66e4e8e3a7536175ca0f6b2..5bf03a58899c9a2d717e71d37607f9f38b71c3ad 100644 (file)
--- a/src/lib/elm_genlist.eo
+++ b/src/lib/elm_genlist.eo
@@ -48,11 +48,7 @@ class Elm.Genlist (Elm.Layout, Elm_Interface_Scrollable, Evas.Clickable_Interfac
             [[Get the genlist select mode.]]
          }
          values {
-<<<<<<< HEAD
-            Elm_Object_Select_Mode mode(4); /*@ The select mode */
-=======
             mode: Elm.Object.Select_Mode(Elm.Object.Select_Mode.max); [[The select mode.]]
->>>>>>> opensource/master
          }
       }
       @property focus_on_selection {
@@ -161,11 +157,7 @@ class Elm.Genlist (Elm.Layout, Elm_Interface_Scrollable, Evas.Clickable_Interfac
             ]]
          }
          values {
-<<<<<<< HEAD
-            Elm_Object_Multi_Select_Mode mode(2); /*@ The multi select mode */
-=======
             mode: Elm.Object.Multi_Select_Mode(Elm.Object.Multi_Select_Mode.max); [[The multi select mode]]
->>>>>>> opensource/master
          }
       }
       @property block_count {
@@ -258,11 +250,7 @@ class Elm.Genlist (Elm.Layout, Elm_Interface_Scrollable, Evas.Clickable_Interfac
             [[Get the horizontal stretching mode.]]
          }
          values {
-<<<<<<< HEAD
-            Elm_List_Mode mode(4); /*@ The mode to use (one of #ELM_LIST_SCROLL or #ELM_LIST_LIMIT). */
-=======
             mode: Elm_List_Mode(4); [[The mode to use (one of #ELM_LIST_SCROLL or #ELM_LIST_LIMIT).]]
->>>>>>> opensource/master
          }
       }
       @property decorated_item {

diff --git a/src/lib/elm_list.eo b/src/lib/elm_list.eo
index 6877f1044b5f850a807b140d0f9a7137f27ed75a..0505e076068a5eafb802aec9a4fe20e2d43658ac 100644 (file)
--- a/src/lib/elm_list.eo
+++ b/src/lib/elm_list.eo
@@ -1,16 +1,4 @@
-<<<<<<< HEAD
-class Elm_List (Elm_Layout, Elm_Interface_Scrollable,
-                Elm_Interface_Atspi_Widget_Action, Elm_Interface_Atspi_Selection)
-{
-   eo_prefix: elm_obj_list;
-   properties {
-      horizontal {
-         set {
-            /*@
-            Enable or disable horizontal mode on the list object.
-=======
 import elm_general;
->>>>>>> opensource/master
 
 enum Elm.List.Mode
 {
@@ -139,11 +127,7 @@ class Elm.List (Elm.Layout, Elm_Interface_Scrollable,
          get {
          }
          values {
-<<<<<<< HEAD
-            Elm_Object_Multi_Select_Mode mode(2); /*@ The multi select mode */
-=======
             mode: Elm.Object.Multi_Select_Mode(Elm.Object.Multi_Select_Mode.max); [[The multi select mode]]
->>>>>>> opensource/master
          }
       }
       @property mode {
@@ -166,12 +150,7 @@ class Elm.List (Elm.Layout, Elm_Interface_Scrollable,
          get {
          }
          values {
-<<<<<<< HEAD
-            Elm_List_Mode mode(4); /*@ One of #Elm_List_Mode: #ELM_LIST_COMPRESS,
-            #ELM_LIST_SCROLL, #ELM_LIST_LIMIT or #ELM_LIST_EXPAND. */
-=======
             mode: Elm.List.Mode(Elm.List.Mode.last); [[One of #Elm_List_Mode: #ELM_LIST_COMPRESS, #ELM_LIST_SCROLL, #ELM_LIST_LIMIT or #ELM_LIST_EXPAND.]]
->>>>>>> opensource/master
          }
       }
       @property selected_item {