summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
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