summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-06-21 10:59:24 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-06-21 10:59:24 -0700
commit4e0e8dad05383f2eb210e246c8f2676f158be2cf (patch)
tree403e67a15ad090a0fe05b69a890409453fd38da3 /lib
parentef6db4f2be11308b09193ac6f59057ab23aebf1a (diff)
downloadpsych-4e0e8dad05383f2eb210e246c8f2676f158be2cf.zip
merge from ruby trunk
Diffstat (limited to 'lib')
-rw-r--r--lib/psych/deprecated.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/psych/deprecated.rb b/lib/psych/deprecated.rb
index f4034e3..333c3a1 100644
--- a/lib/psych/deprecated.rb
+++ b/lib/psych/deprecated.rb
@@ -76,6 +76,7 @@ module Psych
end
class Object
+ undef :to_yaml_properties rescue nil
def to_yaml_properties # :nodoc:
instance_variables
end