diff options
| author | zzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-28 01:11:55 +0000 |
|---|---|---|
| committer | zzak <zzak@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-28 01:11:55 +0000 |
| commit | 2068f3cedb8aa5b1e11bec519b7a6b7ff8f7ab71 (patch) | |
| tree | 511e0911f5af338c156ca27c489d71f006c79e8a | |
| parent | 6fe3e9e48877d4a7d373f8db476f0855f69b605f (diff) | |
* lib/yaml.rb: Disable setting YAML const twice [ruby-core:54642]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40509 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/yaml.rb | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Sun Apr 28 10:10:00 2013 Zachary Scott <[email protected]> + + * lib/yaml.rb: Disable setting YAML const twice [ruby-core:54642] + Sun Apr 28 09:50:00 2013 Zachary Scott <[email protected]> * object.c: Documentation for taint and trust [Bug #8162] diff --git a/lib/yaml.rb b/lib/yaml.rb index f2177accbd..484cd06941 100644 --- a/lib/yaml.rb +++ b/lib/yaml.rb @@ -79,5 +79,5 @@ end # # For more advanced details on the implementation see Psych, and also check out # yaml.org for spec details and other helpful information. -module YAML; end +module YAML end if false YAML = Psych |