ryuan pushed a commit to branch master.
commit 5441d83e4458694392024ed6e47b7b5764152550
Author: Ryuan Choi <[email protected]>
Date: Mon Jun 24 14:39:25 2013 +0900
ChangeLog: removed <<<<< HEAD, someone merged wrong.
---
ChangeLog | 1 -
1 file changed, 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 58b1f79..ffcd50e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
--
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
