diff options
| author | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2017-03-23 12:44:07 +0900 |
|---|---|---|
| committer | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2017-03-27 10:12:41 +0900 |
| commit | 5e0c3160ea0412b866e1e949890eb02e9c4c186c (patch) | |
| tree | a5caa4002e54ab1f5d46d9e68d015133104d27b5 /lib/psych/visitors/yaml_tree.rb | |
| parent | 6b60fb203df3ec9efd2a5cb2a41f46116c164009 (diff) | |
| download | psych-5e0c3160ea0412b866e1e949890eb02e9c4c186c.zip | |
Removed to_yaml support on YAMLTree
Diffstat (limited to 'lib/psych/visitors/yaml_tree.rb')
| -rw-r--r-- | lib/psych/visitors/yaml_tree.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/psych/visitors/yaml_tree.rb b/lib/psych/visitors/yaml_tree.rb index 3606596..2b61f13 100644 --- a/lib/psych/visitors/yaml_tree.rb +++ b/lib/psych/visitors/yaml_tree.rb @@ -130,6 +130,7 @@ module Psych return @emitter.alias anchor end +<<<<<<< HEAD if target.respond_to?(:to_yaml) begin loc = target.method(:to_yaml).source_location.first @@ -148,6 +149,8 @@ module Psych end end +======= +>>>>>>> Removed to_yaml support on YAMLTree if target.respond_to?(:encode_with) dump_coder target else |