summaryrefslogtreecommitdiff
path: root/NEWS
diff options
context:
space:
mode:
authorChunEon Park <hermet@hermet.pe.kr>2013-11-04 22:19:09 +0900
committerChunEon Park <hermet@hermet.pe.kr>2013-11-04 22:19:09 +0900
commit3bb34498ea5268b0b62f89d3324dd04fe8e5b8fb (patch)
tree1b569eac469573e171c6ddc8f0d51914c637921e /NEWS
parenta61bbe7dcf0c6936e3104b35d56a7ed330da4176 (diff)
elementary - removed unintended conflicted lines
that was introduced by a61bbe7dcf0c6936e3104b35d56a7ed330da4176
Diffstat (limited to 'NEWS')
-rw-r--r--NEWS1
1 files changed, 0 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 0e0d6bb..1a8b19f 100644
--- a/NEWS
+++ b/NEWS
@@ -102,7 +102,6 @@ Additions:
102 * Add elm_slider_step_get(), elm_slider_step_set() for slider. 102 * Add elm_slider_step_get(), elm_slider_step_set() for slider.
103 * Add multi select mode for genlist/gengrid. 103 * Add multi select mode for genlist/gengrid.
104 * Add ELM_OBJECT_MULTIPLE_SELECT_MODE_WITH_CONTROL select mode for genlist/gengrid. 104 * Add ELM_OBJECT_MULTIPLE_SELECT_MODE_WITH_CONTROL select mode for genlist/gengrid.
105>>>>>>> parent of f67ecb2... popup: Added support for popup move. elm_popup_move.
106 105
107Improvements: 106Improvements:
108 107