diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2011-05-24 05:40:05 -0700 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2011-05-24 05:40:05 -0700 |
commit | dac68cb92265d2ff5d83560e8cd53ce17098aa30 (patch) | |
tree | e35dae2a40c52d8cf03239185aa2f99a7ebaf3b5 /activerecord/test | |
parent | cedadad8911a0201891eeb9efc7682d2f2468c3b (diff) | |
parent | 79dc275b8d1676976f8f633c9e678fa511ccaf52 (diff) | |
download | rails-dac68cb92265d2ff5d83560e8cd53ce17098aa30.tar.gz rails-dac68cb92265d2ff5d83560e8cd53ce17098aa30.tar.bz2 rails-dac68cb92265d2ff5d83560e8cd53ce17098aa30.zip |
Merge pull request #1257 from dmathieu/yml_alias
Properly reference yml alias nodes
Diffstat (limited to 'activerecord/test')
-rw-r--r-- | activerecord/test/fixtures/parrots.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/fixtures/parrots.yml b/activerecord/test/fixtures/parrots.yml index 8b73b8cdf6..8425ef98e0 100644 --- a/activerecord/test/fixtures/parrots.yml +++ b/activerecord/test/fixtures/parrots.yml @@ -24,4 +24,4 @@ DEFAULTS: &DEFAULTS parrot_sti_class: LiveParrot davey: - <<: *DEFAULTS + *DEFAULTS |