From 4a66fdcad39b1420670b1690e5128bb4713a0dbc Mon Sep 17 00:00:00 2001
From: aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 21 Nov 2002 11:09:22 +0000
Subject: [PATCH] sorry, conflicts in ChangeLog is now resolved.

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

diff --git a/ChangeLog b/ChangeLog
index e07659635c..0970f7b383 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -97,7 +97,6 @@ Thu Nov 14 22:40:29 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 	  block to beginning line, instead of the first statement inside
 	  the block.
 
->>>>>>> 1.1270
 Thu Nov 14 08:23:42 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* math.c (math_acos): check errno after operation.  ditto for