Fix conflicts: Map, Hover, Hoversel, Menu, Web

[framework/uifw/elementary.git] / src / lib / elm_hover.h

diff --git a/src/lib/elm_hover.h b/src/lib/elm_hover.h
index fd60a6d..593d65c 100644 (file)
--- a/src/lib/elm_hover.h
+++ b/src/lib/elm_hover.h
@@ -40,11 +40,7 @@
  * @li "smart,changed" - a content object placed under the "smart"
  *                   policy was replaced to a new slot direction.
  *
-<<<<<<< HEAD
- * Default contents parts of the hover widget that you can use for are:
-=======
  * Default content parts of the hover widget that you can use for are:
->>>>>>> remotes/origin/upstream
  * @li "left"
  * @li "top-left"
  * @li "top"
@@ -56,20 +52,12 @@
  * @li "middle"
  * @li "smart"
  *
-<<<<<<< HEAD
- * @note These contents parts indicates the direction that the content will be
-=======
  * @note These content parts indicates the direction that the content will be
->>>>>>> remotes/origin/upstream
  * displayed
  *
  * All directions may have contents at the same time, except for
  * "smart". This is a special placement hint and its use case
-<<<<<<< HEAD
- * independs of the calculations coming from
-=======
  * depends of the calculations coming from
->>>>>>> remotes/origin/upstream
  * elm_hover_best_content_location_get(). Its use is for cases when
  * one desires only one hover content, but with a dynamic special
  * placement within the hover area. The content's geometry, whenever
@@ -94,11 +82,7 @@
  */
 typedef enum
 {
-<<<<<<< HEAD
-   ELM_HOVER_AXIS_NONE, /**< ELM_HOVER_AXIS_NONE -- no prefered orientation */
-=======
    ELM_HOVER_AXIS_NONE, /**< ELM_HOVER_AXIS_NONE -- no preferred orientation */
->>>>>>> remotes/origin/upstream
    ELM_HOVER_AXIS_HORIZONTAL, /**< ELM_HOVER_AXIS_HORIZONTAL -- horizontal */
    ELM_HOVER_AXIS_VERTICAL, /**< ELM_HOVER_AXIS_VERTICAL -- vertical */
    ELM_HOVER_AXIS_BOTH /**< ELM_HOVER_AXIS_BOTH -- both */
@@ -165,26 +149,15 @@ EAPI Evas_Object *elm_hover_parent_get(const Evas_Object *obj);
  * space.
  *
  * @p pref_axis may be one of
-<<<<<<< HEAD
- * - @c ELM_HOVER_AXIS_NONE -- no prefered orientation
-=======
  * - @c ELM_HOVER_AXIS_NONE -- no preferred orientation
->>>>>>> remotes/origin/upstream
  * - @c ELM_HOVER_AXIS_HORIZONTAL -- horizontal
  * - @c ELM_HOVER_AXIS_VERTICAL -- vertical
  * - @c ELM_HOVER_AXIS_BOTH -- both
  *
-<<<<<<< HEAD
- * If ELM_HOVER_AXIS_HORIZONTAL is choosen the returned position will
- * nescessarily be along the horizontal axis("left" or "right"). If
- * ELM_HOVER_AXIS_VERTICAL is choosen the returned position will nescessarily
- * be along the vertical axis("top" or "bottom"). Chossing
-=======
  * If ELM_HOVER_AXIS_HORIZONTAL is chosen the returned position will
  * necessarily be along the horizontal axis("left" or "right"). If
  * ELM_HOVER_AXIS_VERTICAL is chosen the returned position will necessarily
  * be along the vertical axis("top" or "bottom"). Choosing
->>>>>>> remotes/origin/upstream
  * ELM_HOVER_AXIS_BOTH or ELM_HOVER_AXIS_NONE has the same effect and the
  * returned position may be in either axis.
  *