diff options
| author | aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-11-21 11:09:22 +0000 |
|---|---|---|
| committer | aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-11-21 11:09:22 +0000 |
| commit | fc157fb47ccca32d5214cbf3479b5c09eb5b9e46 (patch) | |
| tree | 7d4ebc02a7cdc03e1ca8bffd371adc1fe2ba441a /ChangeLog | |
| parent | afc486783433e2c21d7372ea04e6026bb5311678 (diff) | |
| download | ruby-fc157fb47ccca32d5214cbf3479b5c09eb5b9e46.tar.gz ruby-fc157fb47ccca32d5214cbf3479b5c09eb5b9e46.tar.xz ruby-fc157fb47ccca32d5214cbf3479b5c09eb5b9e46.zip | |
sorry, conflicts in ChangeLog is now resolved.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@3069 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -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 |