diff options
| author | Michael Koziarski <michael@koziarski.com> | 2009-09-04 14:28:32 +1200 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2009-09-04 14:28:32 +1200 |
| commit | 87c93da440b099856fe3437c5bb269f01fb95379 (patch) | |
| tree | 63c3f7806443a540358e5d4df8ee814ce22bb100 /activemodel/test/cases/serializeration/json_serialization_test.rb | |
| parent | b16e0c922344da256ab977fd5e7a7f69e0be90fc (diff) | |
| download | rails-87c93da440b099856fe3437c5bb269f01fb95379.tar.gz rails-87c93da440b099856fe3437c5bb269f01fb95379.tar.bz2 rails-87c93da440b099856fe3437c5bb269f01fb95379.zip | |
Fix a messed up merge commit
Diffstat (limited to 'activemodel/test/cases/serializeration/json_serialization_test.rb')
0 files changed, 0 insertions, 0 deletions