diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-12 18:08:41 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-12 18:08:41 -0700 |
| commit | 84908bbde97ef70b09aca4937793052422bc06ed (patch) | |
| tree | 48bc00a262397f38317e1e5c430434fde3ac9492 /activerecord/test/fixtures | |
| parent | 325c9d5e5235db4b5210d9db6c863835d1ac7eed (diff) | |
| download | rails-84908bbde97ef70b09aca4937793052422bc06ed.tar.gz rails-84908bbde97ef70b09aca4937793052422bc06ed.tar.bz2 rails-84908bbde97ef70b09aca4937793052422bc06ed.zip | |
fix bad merge
Diffstat (limited to 'activerecord/test/fixtures')
0 files changed, 0 insertions, 0 deletions