1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

remove garbages.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36996 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-09-20 07:06:06 +00:00
parent a9fefe7555
commit 2b64e10feb
4 changed files with 4 additions and 7 deletions

View file

@ -1,17 +1,14 @@
<<<<<<< .mine
Thu Sep 20 10:56:08 2012 NAKAMURA Usaku <usa@ruby-lang.org> Thu Sep 20 10:56:08 2012 NAKAMURA Usaku <usa@ruby-lang.org>
* test/drb/ut_drb.rb: revert a part of r36987, and get rid of a warning * test/drb/ut_drb.rb: revert a part of r36987, and get rid of a warning
with another method. if the substitution is removed, the ExtSrv with another method. if the substitution is removed, the ExtSrv
object will be GC'ed and some tests will be blocked. object will be GC'ed and some tests will be blocked.
=======
Thu Sep 20 10:30:00 2012 Zachary Scott <zzak@ruby-lang.org> Thu Sep 20 10:30:00 2012 Zachary Scott <zzak@ruby-lang.org>
* lib/find.rb: Error in documentation example * lib/find.rb: Error in documentation example
Found by Herwin Weststrate, thank you! Found by Herwin Weststrate, thank you!
>>>>>>> .r36994
Thu Sep 20 07:20:00 2012 Zachary Scott <zzak@ruby-lang.org> Thu Sep 20 07:20:00 2012 Zachary Scott <zzak@ruby-lang.org>
* complex.c: Examples for Complex Documentation. * complex.c: Examples for Complex Documentation.