merging from ruby trunk

ruby · Jun 6, 2011 · 7880a4b · 7880a4b
1 parent e13ab95
commit 7880a4b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/psych/nodes.rb b/lib/psych/nodes.rb
@@ -31,7 +31,7 @@ module Psych
   #   doc    = Psych::Nodes::Document.new
   #   seq    = Psych::Nodes::Sequence.new
   #   scalar = Psych::Nodes::Scalar.new('foo')
-  #   
+  #
   #   # Build up our tree
   #   stream.children << doc
   #   doc.children    << seq

diff --git a/test/psych/test_null.rb b/test/psych/test_null.rb
@@ -10,7 +10,7 @@ def test_null_list
 ---
 - ~
 - null
-- 
+-
 - Null
 - NULL
       eoyml

diff --git a/test/psych/test_struct.rb b/test/psych/test_struct.rb
@@ -39,7 +39,7 @@ def test_roundtrip
 
     def test_load
       obj = Psych.load(<<-eoyml)
---- !ruby/struct:PsychStructWithIvar 
+--- !ruby/struct:PsychStructWithIvar
 :foo: bar
 :@bar: hello
       eoyml