diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-09-28 23:17:07 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-09-28 23:17:07 +0530 |
| commit | 955a72c692a4298d238cc2e6353b9874099203f1 (patch) | |
| tree | 2a05fecd15526cd0013c22e45825be1aca4844d9 /activerecord/lib/active_record/fixtures/file.rb | |
| parent | 77fbe1c0199567486c422fdf5cce49f2c11fc953 (diff) | |
| parent | cf3e760b87c49470c9a26ab3e2da67602474be1f (diff) | |
| download | rails-955a72c692a4298d238cc2e6353b9874099203f1.tar.gz rails-955a72c692a4298d238cc2e6353b9874099203f1.tar.bz2 rails-955a72c692a4298d238cc2e6353b9874099203f1.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
actionpack/lib/action_view/helpers/asset_tag_helper.rb
Diffstat (limited to 'activerecord/lib/active_record/fixtures/file.rb')
| -rw-r--r-- | activerecord/lib/active_record/fixtures/file.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/fixtures/file.rb b/activerecord/lib/active_record/fixtures/file.rb index a9cabf5a7b..0f6ab3e396 100644 --- a/activerecord/lib/active_record/fixtures/file.rb +++ b/activerecord/lib/active_record/fixtures/file.rb @@ -3,7 +3,7 @@ require 'yaml' module ActiveRecord class Fixtures - class File + class File # :nodoc: include Enumerable ## |