diff --git a/ChangeLog b/ChangeLog
index 46497c813f..9a6337c59b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Mar 25 21:45:00 2004  Shigeo Kobayashi <shigek@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c: Bug in + and - reported by Bret Jolly
+	  fixed.
+
 Thu Mar 25 21:01:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* version.c (ruby_show_copyright): obtain copyright year from
@@ -5,6 +10,7 @@ Thu Mar 25 21:01:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* win32/resource.rb: ditto.
 
+>>>>>>> 1.3093
 Thu Mar 25 19:37:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* win32/resource.rb: default rubyw icon to ruby.ico, and let DLL also