delete CVS confliction indicator. sorry.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4684 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
gotoyuzo 2003-10-04 18:48:32 +00:00
parent d0dd2997f3
commit 0afc6e3f4f

View File

@ -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