matz	2007-09-08 10:24:00 +0900 (Sat, 08 Sep 2007)

  New Revision: 13412

  Modified files:
    trunk/ChangeLog

  Log:
    ChangeLog: conflict resolution

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13412&r2=13411

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 13411)
+++ ChangeLog	(revision 13412)
@@ -1,16 +1,13 @@
-<<<<<<< current
-Sat Sep  8 09:33:09 2007  Tadayoshi Funaba  <tadf@d...>
-
-	* lib/date/format.rb (str[fp]time): now check specifications more
-	  strictly.
-
-=======
 Sat Sep  8 10:05:14 2007  Yukihiro Matsumoto  <matz@r...>
 
 	* 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  <tadf@d...>
+
+	* lib/date/format.rb (str[fp]time): now check specifications more
+	  strictly.
+
 Sat Sep  8 02:56:31 2007  Yukihiro Matsumoto  <matz@r...>
 
 	* test/ruby/test_fiber.rb (TestFiber::test_throw): uncaught throw

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml