From 1a7ffeded0663b1d958addd95f5c28363fcd5f23 Mon Sep 17 00:00:00 2001
From: Ryuan Choi <ryuan.choi@gmail.com>
Date: Mon, 24 Jun 2013 14:39:25 +0900
Subject: [PATCH] ChangeLog: removed <<<<< HEAD, someone merged wrong.

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

diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog
index 58b1f79ed6..ffcd50e9e0 100644
--- a/legacy/elementary/ChangeLog
+++ b/legacy/elementary/ChangeLog
@@ -1399,7 +1399,6 @@
 
         * Add magnifier to entry.
 
-<<<<<<< HEAD
 2013-06-10  ChunEon Park (Hermet)
 
         * Remove the keyboard area in the conformant if the keyboard state is off.