From 22bcf22ea4ed3a49c497679c5fa82b6542787a47 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 8 Sep 2007 01:24:00 +0000
Subject: [PATCH] ChangeLog: conflict resolution

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13412 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5d59454c74..1040e093e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,16 +1,13 @@
-<<<<<<< current
-Sat Sep  8 09:33:09 2007  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date/format.rb (str[fp]time): now check specifications more
-	  strictly.
-
-=======
 Sat Sep  8 10:05:14 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* 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@dotrb.org>
+
+	* lib/date/format.rb (str[fp]time): now check specifications more
+	  strictly.
+
 Sat Sep  8 02:56:31 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* test/ruby/test_fiber.rb (TestFiber::test_throw): uncaught throw