From fc157fb47ccca32d5214cbf3479b5c09eb5b9e46 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: sorry, conflicts in ChangeLog is now resolved.

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index e07659635..0970f7b38 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
-- 
cgit