summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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.