summaryrefslogtreecommitdiff
path: root/legacy/elementary
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
commit1a7ffeded0663b1d958addd95f5c28363fcd5f23 (patch)
treef43c411d534e69c232803ae73e09ec2c5eb9a439 /legacy/elementary
parentcdae0e4064a62711af270a3c4be78876b039d512 (diff)
ChangeLog: removed <<<<< HEAD, someone merged wrong.
Diffstat (limited to 'legacy/elementary')
-rw-r--r--legacy/elementary/ChangeLog1
1 files changed, 0 insertions, 1 deletions
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 @@
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.