forked from enlightenment/efl
ChangeLog: removed <<<<< HEAD, someone merged wrong.
This commit is contained in:
parent
cdae0e4064
commit
1a7ffeded0
|
@ -1399,7 +1399,6 @@
|
||||||
|
|
||||||
* Add magnifier to entry.
|
* Add magnifier to entry.
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
2013-06-10 ChunEon Park (Hermet)
|
2013-06-10 ChunEon Park (Hermet)
|
||||||
|
|
||||||
* Remove the keyboard area in the conformant if the keyboard state is off.
|
* Remove the keyboard area in the conformant if the keyboard state is off.
|
||||||
|
|
Loading…
Reference in New Issue