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