From be031bf3cb836541436f2e7c8136a572e358acf1 Mon Sep 17 00:00:00 2001 From: matz Date: Sat, 8 Sep 2007 01:24:00 +0000 Subject: ChangeLog: conflict resolution git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13412 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5d59454c7..1040e093e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,16 +1,13 @@ -<<<<<<< current -Sat Sep 8 09:33:09 2007 Tadayoshi Funaba - - * lib/date/format.rb (str[fp]time): now check specifications more - strictly. - -======= Sat Sep 8 10:05:14 2007 Yukihiro Matsumoto * struct.c (rb_struct_s_members): check if __members__ is an array to prevent segmentation fault. [ruby-dev:31759] ->>>>>>> patched +Sat Sep 8 09:33:09 2007 Tadayoshi Funaba + + * lib/date/format.rb (str[fp]time): now check specifications more + strictly. + Sat Sep 8 02:56:31 2007 Yukihiro Matsumoto * test/ruby/test_fiber.rb (TestFiber::test_throw): uncaught throw -- cgit