diff options
| author | wangjohn <wangjohn@mit.edu> | 2013-08-21 16:34:36 -0400 |
|---|---|---|
| committer | wangjohn <wangjohn@mit.edu> | 2013-08-21 16:34:36 -0400 |
| commit | ae54e41824011692106fe7a27dc0991a6342096d (patch) | |
| tree | 585d6ff5256b667efacc2cbf1383308b17847f34 /guides/code/getting_started/test/models | |
| parent | 631a2d977016df28ccf15f894f78ccaf3dfef913 (diff) | |
| download | rails-ae54e41824011692106fe7a27dc0991a6342096d.tar.gz rails-ae54e41824011692106fe7a27dc0991a6342096d.tar.bz2 rails-ae54e41824011692106fe7a27dc0991a6342096d.zip | |
Removing merge conflict remnants in the guides.
Diffstat (limited to 'guides/code/getting_started/test/models')
0 files changed, 0 insertions, 0 deletions