From 209bc2107b36bcc531ee81616584733b83c771c7 Mon Sep 17 00:00:00 2001
From: Daniel Juyung Seo <seojuyung@gmail.com>
Date: Thu, 22 Aug 2013 05:30:29 +0900
Subject: [PATCH] ChangeLog: remove remained conflict markers.

---
 legacy/elementary/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

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 @@
         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