diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-03-06 20:34:56 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-03-06 20:34:56 +0100 |
| commit | 3a621e7be4d5f592e04e8ee03435936f9e5f1c36 (patch) | |
| tree | 894abbc4e3047104b3d84c0ea11eed670db58c5d /activerecord/test/models/reference.rb | |
| parent | 89d825d02172f7c1ba1211119ea9844206aae9c3 (diff) | |
| download | rails-3a621e7be4d5f592e04e8ee03435936f9e5f1c36.tar.gz rails-3a621e7be4d5f592e04e8ee03435936f9e5f1c36.tar.bz2 rails-3a621e7be4d5f592e04e8ee03435936f9e5f1c36.zip | |
removes merge conflicts
Diffstat (limited to 'activerecord/test/models/reference.rb')
0 files changed, 0 insertions, 0 deletions