diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2015-10-29 09:21:57 -0600 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-10-29 09:22:45 -0600 |
| commit | 4a2d586cfcd58c0d65dfe7e603e4e5e84418801e (patch) | |
| tree | 0ff5b1bfb55b6d209be0d72c90fc2b6d14874342 /activerecord/test/models/parrot.rb | |
| parent | 59ec8a592d7125f12e33a8aba22b4d2fc4ae301f (diff) | |
| parent | 7c0f8c64fa1e8e055e2077255843f149e600024b (diff) | |
| download | rails-4a2d586cfcd58c0d65dfe7e603e4e5e84418801e.tar.gz rails-4a2d586cfcd58c0d65dfe7e603e4e5e84418801e.tar.bz2 rails-4a2d586cfcd58c0d65dfe7e603e4e5e84418801e.zip | |
Fix merge conflicts from #19501
I'm making this commit separately because this has failing tests and
style nitpicks that I'd like to make as individual commits, to make the
changes I'm making explicit.
We still want a single merge commit at the end, however.
Diffstat (limited to 'activerecord/test/models/parrot.rb')
0 files changed, 0 insertions, 0 deletions