diff options
Diffstat (limited to 'test/psych/test_deprecated.rb')
| -rw-r--r-- | test/psych/test_deprecated.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/test/psych/test_deprecated.rb b/test/psych/test_deprecated.rb index e019cfb..d09ff82 100644 --- a/test/psych/test_deprecated.rb +++ b/test/psych/test_deprecated.rb @@ -111,6 +111,7 @@ module Psych assert_equal 'some string', coder.scalar assert_equal :scalar, coder.type end +<<<<<<< HEAD class YamlAs TestCase.suppress_warning do @@ -121,5 +122,7 @@ module Psych def test_yaml_as assert_match(/helloworld/, Psych.dump(YamlAs.new)) end +======= +>>>>>>> Removed Module#psych_yaml_as end end |