diff options
| author | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2017-03-27 10:20:18 +0900 |
|---|---|---|
| committer | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2017-03-27 10:20:18 +0900 |
| commit | 712a65a53f3c15105cd86e8ad3ee3c779050ada4 (patch) | |
| tree | f1b75eb078ec8c05443b327b97ef2d3d1fc1f573 /test | |
| parent | 5e0c3160ea0412b866e1e949890eb02e9c4c186c (diff) | |
| download | psych-712a65a53f3c15105cd86e8ad3ee3c779050ada4.zip | |
Fixed gabage lines
Diffstat (limited to 'test')
| -rw-r--r-- | test/psych/test_deprecated.rb | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/test/psych/test_deprecated.rb b/test/psych/test_deprecated.rb index 3961e36..eab2302 100644 --- a/test/psych/test_deprecated.rb +++ b/test/psych/test_deprecated.rb @@ -87,18 +87,5 @@ module Psych assert_equal 'some string', coder.scalar assert_equal :scalar, coder.type end -<<<<<<< HEAD - - class YamlAs - TestCase.suppress_warning do - yaml_as 'helloworld' - end - end - - def test_yaml_as - assert_match(/helloworld/, Psych.dump(YamlAs.new)) - end -======= ->>>>>>> Removed Module#psych_yaml_as end end |