diff options
| author | Ryuan Choi <ryuan.choi@gmail.com> | 2013-06-24 14:39:25 +0900 |
|---|---|---|
| committer | Ryuan Choi <ryuan.choi@gmail.com> | 2013-06-24 14:42:47 +0900 |
| commit | 5441d83e4458694392024ed6e47b7b5764152550 (patch) | |
| tree | 6b23b43e6cc3cbb543aa3eb53548d63ab9e69865 /ChangeLog | |
| parent | 9de8f41a8d30abc7a364ce16bdfbe38f5ca2d02a (diff) | |
| download | elementary-5441d83e4458694392024ed6e47b7b5764152550.tar.gz | |
ChangeLog: removed <<<<< HEAD, someone merged wrong.
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -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. |