summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorRyuan Choi <ryuan.choi@gmail.com>2013-06-24 14:39:25 +0900
committerRyuan Choi <ryuan.choi@gmail.com>2013-06-24 14:42:47 +0900
commit5441d83e4458694392024ed6e47b7b5764152550 (patch)
tree6b23b43e6cc3cbb543aa3eb53548d63ab9e69865 /ChangeLog
parent9de8f41a8d30abc7a364ce16bdfbe38f5ca2d02a (diff)
ChangeLog: removed <<<<< HEAD, someone merged wrong.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 58b1f79ed..ffcd50e9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1399,7 +1399,6 @@
1399 1399
1400 * Add magnifier to entry. 1400 * Add magnifier to entry.
1401 1401
1402<<<<<<< HEAD
14032013-06-10 ChunEon Park (Hermet) 14022013-06-10 ChunEon Park (Hermet)
1404 1403
1405 * Remove the keyboard area in the conformant if the keyboard state is off. 1404 * Remove the keyboard area in the conformant if the keyboard state is off.