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

ChangeLog: remove remained conflict markers.

This commit is contained in:
Daniel Juyung Seo 2013-08-22 05:30:29 +09:00
parent 9b36fb6055
commit 209bc2107b
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

@ -1511,7 +1511,6 @@
not entry. This prevents the asynchronous states between ime and
conformant.
<<<<<<< HEAD
2013-07-23 ChunEon Park (Hermet)
* File Selector : Support elm_object_part_text_set() for the ok, cancel