summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorDaniel Juyung Seo <seojuyung@gmail.com>2013-08-22 05:30:29 +0900
committerDaniel Juyung Seo <seojuyung@gmail.com>2013-08-22 05:30:29 +0900
commitbfc4cafc1d2bc1effee6e94baa5df32153aa9c0b (patch)
tree229771e72629023592b7ede17906453e803d833b /ChangeLog
parent5c4bc2f561de7f02a014f97108c49657bd8e2a88 (diff)
ChangeLog: remove remained conflict markers.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 562e0598a..cef7b1a4d 100644
--- a/ChangeLog
+++ b/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