diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-04-07 18:20:57 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-04-07 18:20:57 +0100 |
| commit | cab41ff189f4b73d351e07db4babeb69077f5be8 (patch) | |
| tree | a1b789ef0f7113d0ff43ae519098bfdec70c1039 /spec/controllers/user_controller_spec.rb | |
| parent | 17d9a752e60dde5e1b57c40886b3ef0bcbcd904a (diff) | |
correct a bad merge (made test database setup fail)
Diffstat (limited to 'spec/controllers/user_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions