nobu	2012-09-20 16:06:06 +0900 (Thu, 20 Sep 2012)

  New Revision: 36996

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=36996

  Log:
    remove garbages.

  Modified files:
    trunk/ChangeLog
    trunk/array.c
    trunk/complex.c
    trunk/lib/csv.rb

Index: complex.c
===================================================================
--- complex.c	(revision 36995)
+++ complex.c	(revision 36996)
@@ -440,7 +440,7 @@
  *    Complex.rectangular(real[, imag])  ->  complex
  *
  * Returns a complex object which denotes the given rectangular form.
- * 
+ *
  * For example:
  *   Complex.rect(12, 2) # => (12+2i)
  *   Complex.rect(0, 17) # => (0+17i)
Index: array.c
===================================================================
--- array.c	(revision 36995)
+++ array.c	(revision 36996)
@@ -3528,7 +3528,7 @@
  *  Returns a new array that is a copy of the original array, removing any
  *  items that also appear in +other_ary+.
  *
- *  It compares elements using their hash (returned by the Object#hash method).   
+ *  It compares elements using their hash (returned by the Object#hash method).
  *
  *     [ 1, 1, 2, 2, 3, 3, 4, 5 ] - [ 1, 2, 4 ]  #=>  [ 3, 3, 5 ]
  *
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 36995)
+++ ChangeLog	(revision 36996)
@@ -1,17 +1,14 @@
-<<<<<<< .mine
 Thu Sep 20 10:56:08 2012  NAKAMURA Usaku  <usa@r...>
 
 	* 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  <zzak@r...>
 
 	* lib/find.rb: Error in documentation example
 	  Found by Herwin Weststrate, thank you!
 
->>>>>>> .r36994
 Thu Sep 20 07:20:00 2012  Zachary Scott  <zzak@r...>
 
 	* complex.c: Examples for Complex Documentation.
@@ -26,7 +23,7 @@
 
 Thu Sep 20 07:05:00 2012  Zachary Scott  <zzak@r...>
 
-	* 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]
 
Index: lib/csv.rb
===================================================================
--- lib/csv.rb	(revision 36995)
+++ lib/csv.rb	(revision 36996)
@@ -2373,7 +2373,7 @@
 #
 #   CSV("CSV,data") { |c|
 #     c.read.any? { |a| a.include?("zombies") }
-#   } #=> false 
+#   } #=> false
 #
 def CSV(*args, &block)
   CSV.instance(*args, &block)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/