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 /app/views/users/index.html.erb | |
| parent | 91e8c1366f101837519b7dd1e5fa7b53473eb97b (diff) | |
| parent | d0545c2820d101a98b3c895cf6e3691145a62f3c (diff) | |
Merge branch 'clean'
Conflicts:
app/controllers/users_controller.rb
app/views/users/index.html.erb
Diffstat (limited to 'app/views/users/index.html.erb')
| -rw-r--r-- | app/views/users/index.html.erb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index d7b46da..89e369a 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -10,7 +10,6 @@ <th></th> <th></th> <th></th> - <th></th> </tr> </thead> |