1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3d62648b18..586f657305 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Oct 25 11:24:24 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* string.c: improved comment.
+
 Sun Oct 26 07:40:11 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
 
 	* ext/win32ole/win32ole.c (ole_val2variant, ole_invoke): refactoring.
@@ -12,6 +16,7 @@ Sat Oct 25 22:28:17 2014  Tanaka Akira  <akr@fsij.org>
 
 	* io.c (io_binwrite_string): Test writev() failure.
 
+>>>>>>> .r48141
 Sat Oct 25 20:19:19 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
 
 	* test/test-unicode_normalize.rb: added test_us_ascii.