From 10b8e9763facff0e2028c9eb64d840f79d8c5c9e Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Mon, 4 Nov 2013 22:19:09 +0900 Subject: [PATCH] elementary - removed unintended conflicted lines that was introduced by a61bbe7dcf0c6936e3104b35d56a7ed330da4176 --- legacy/elementary/NEWS | 1 - 1 file changed, 1 deletion(-) diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS index 0e0d6bb..1a8b19f 100644 --- a/legacy/elementary/NEWS +++ b/legacy/elementary/NEWS @@ -102,7 +102,6 @@ Additions: * Add elm_slider_step_get(), elm_slider_step_set() for slider. * Add multi select mode for genlist/gengrid. * Add ELM_OBJECT_MULTIPLE_SELECT_MODE_WITH_CONTROL select mode for genlist/gengrid. ->>>>>>> parent of f67ecb2... popup: Added support for popup move. elm_popup_move. Improvements: -- 2.7.4