sorry, conflicts in ChangeLog is now resolved.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3069 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
c157dff026
commit
4a66fdcad3
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user