From 2b64e10feb46cf6fafc57a036e80ee497806213f Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 20 Sep 2012 07:06:06 +0000 Subject: remove garbages. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36996 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 059cb1e6db..76884d5a95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,17 +1,14 @@ -<<<<<<< .mine Thu Sep 20 10:56:08 2012 NAKAMURA Usaku * 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 object will be GC'ed and some tests will be blocked. -======= Thu Sep 20 10:30:00 2012 Zachary Scott * lib/find.rb: Error in documentation example Found by Herwin Weststrate, thank you! ->>>>>>> .r36994 Thu Sep 20 07:20:00 2012 Zachary Scott * complex.c: Examples for Complex Documentation. @@ -26,7 +23,7 @@ Thu Sep 20 07:15:00 2012 Zachary Scott Thu Sep 20 07:05:00 2012 Zachary Scott - * lib/csv.rb (Object#CSV, Array#to_csv, String#parse_csv): + * lib/csv.rb (Object#CSV, Array#to_csv, String#parse_csv): Examples and documentation for CSV. [Bug #6880] [ruby-core:47218] -- cgit v1.2.3