diff options
| -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 |