Skip to content
This repository
Browse code

merging from ruby trunk

  • Loading branch information...
commit 7880a4bc224f938e2d22f1f94315e8cd49aa6d1c 1 parent e13ab95
Aaron Patterson authored June 05, 2011
2  lib/psych/nodes.rb
@@ -31,7 +31,7 @@ module Psych
31 31
   #   doc    = Psych::Nodes::Document.new
32 32
   #   seq    = Psych::Nodes::Sequence.new
33 33
   #   scalar = Psych::Nodes::Scalar.new('foo')
34  
-  #   
  34
+  #
35 35
   #   # Build up our tree
36 36
   #   stream.children << doc
37 37
   #   doc.children    << seq
2  test/psych/test_null.rb
@@ -10,7 +10,7 @@ def test_null_list
10 10
 ---
11 11
 - ~
12 12
 - null
13  
-- 
  13
+-
14 14
 - Null
15 15
 - NULL
16 16
       eoyml
2  test/psych/test_struct.rb
@@ -39,7 +39,7 @@ def test_roundtrip
39 39
 
40 40
     def test_load
41 41
       obj = Psych.load(<<-eoyml)
42  
---- !ruby/struct:PsychStructWithIvar 
  42
+--- !ruby/struct:PsychStructWithIvar
43 43
 :foo: bar
44 44
 :@bar: hello
45 45
       eoyml

0 notes on commit 7880a4b

Please sign in to comment.
Something went wrong with that request. Please try again.