diff options
| author | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-10-04 18:48:32 +0000 |
|---|---|---|
| committer | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-10-04 18:48:32 +0000 |
| commit | 0afc6e3f4ff543562b08c0ebe72b4d08fe499646 (patch) | |
| tree | f8e7a4b81c7d3482a2a9313a7a845b28a0d44550 /ChangeLog | |
| parent | d0dd2997f3be288120d1a5752c70431c85c6c988 (diff) | |
| download | ruby-0afc6e3f4ff543562b08c0ebe72b4d08fe499646.tar.gz | |
delete CVS confliction indicator. sorry.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4684 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -21,7 +21,6 @@ Sun Oct 5 02:12:00 2003 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp> * lib/drb/drb.rb: exit from a thread using 'break'. ->>>>>>> 1.2257 Sat Oct 4 21:49:14 2003 WATANABE Hirofumi <eban@ruby-lang.org> * gc.c (Init_stack): the type of space is changed to unsigned int |