summaryrefslogtreecommitdiff
path: root/legacy/elementary/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'legacy/elementary/ChangeLog')
-rw-r--r--legacy/elementary/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog
index 562e0598aa..cef7b1a4d9 100644
--- a/legacy/elementary/ChangeLog
+++ b/legacy/elementary/ChangeLog
@@ -1511,7 +1511,6 @@
1511 not entry. This prevents the asynchronous states between ime and 1511 not entry. This prevents the asynchronous states between ime and
1512 conformant. 1512 conformant.
1513 1513
1514<<<<<<< HEAD
15152013-07-23 ChunEon Park (Hermet) 15142013-07-23 ChunEon Park (Hermet)
1516 1515
1517 * File Selector : Support elm_object_part_text_set() for the ok, cancel 1516 * File Selector : Support elm_object_part_text_set() for the ok, cancel