matz	2007-09-12 23:16:18 +0900 (Wed, 12 Sep 2007)

  New Revision: 13433

  Modified files:
    branches/ruby_1_8/ChangeLog

  Log:
    ChangeLog conflict resolution

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=13433&r2=13432

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 13432)
+++ ruby_1_8/ChangeLog	(revision 13433)
@@ -1,15 +1,12 @@
-<<<<<<< current
+Mon Sep 10 01:05:25 2007  Yukihiro Matsumoto  <matz@r...>
+
+	* range.c (range_step): fixed integer overflow.  [ruby-dev:31763]
+
 Sun Sep  9 09:14:45 2007  Tadayoshi Funaba  <tadf@d...>
 
 	* lib/date/format.rb (_strptime): now also attaches an element
 	  which denotes leftover substring if exists.
 
-=======
-Mon Sep 10 01:05:25 2007  Yukihiro Matsumoto  <matz@r...>
-
-	* range.c (range_step): fixed integer overflow.  [ruby-dev:31763]
-
->>>>>>> patched
 Sat Sep  8 10:22:20 2007  Yukihiro Matsumoto  <matz@r...>
 
 	* struct.c (rb_struct_s_members): should raise TypeError instead

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