ChangeLog: remove remained conflict markers.

diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog
index 562e059..cef7b1a 100644 (file)
--- a/legacy/elementary/ChangeLog
+++ b/legacy/elementary/ChangeLog
@@ -1511,7 +1511,6 @@
         not entry. This prevents the asynchronous states between ime and
         conformant.
 
-<<<<<<< HEAD
 2013-07-23  ChunEon Park (Hermet)
 
         * File Selector : Support elm_object_part_text_set() for the ok, cancel