diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-05 21:50:24 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-05 21:50:24 -0500 |
| commit | 5f5ce9123215bfc5b68e4521f2697bff1ea96595 (patch) | |
| tree | ad8ea3eab038db964493bc2ebf31a1b7b71bed56 /test/fixtures | |
| parent | 91e8c1366f101837519b7dd1e5fa7b53473eb97b (diff) | |
| parent | d0545c2820d101a98b3c895cf6e3691145a62f3c (diff) | |
Merge branch 'clean'
Conflicts:
app/controllers/users_controller.rb
app/views/users/index.html.erb
Diffstat (limited to 'test/fixtures')
| -rw-r--r-- | test/fixtures/users.yml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index cf39694..ea3e874 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -4,12 +4,8 @@ one: name: MyString email: MyString user_name: MyString - password_digest: MyString - remember_token: MyString two: name: MyString email: MyString user_name: MyString - password_digest: MyString - remember_token: MyString |