rvandegrift
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ChangeLog: removed <<<<< HEAD, someone merged wrong.

This commit is contained in:
Ryuan Choi 2013-06-24 14:39:25 +09:00
parent cdae0e4064
commit 1a7ffeded0
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
legacy/elementary/ChangeLog
View File

@ -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.