seoz pushed a commit to branch master.
commit bfc4cafc1d2bc1effee6e94baa5df32153aa9c0b
Author: Daniel Juyung Seo <[email protected]>
Date: Thu Aug 22 05:30:29 2013 +0900
ChangeLog: remove remained conflict markers.
---
ChangeLog | 1 -
1 file changed, 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 562e059..cef7b1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
--
------------------------------------------------------------------------------
Introducing Performance Central, a new site from SourceForge and
AppDynamics. Performance Central is your source for news, insights,
analysis and resources for efficient Application Performance Management.
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk
