diff options
| author | AndrewMurrell <amurrel@purdue.edu> | 2014-04-01 17:17:49 -0400 |
|---|---|---|
| committer | AndrewMurrell <amurrel@purdue.edu> | 2014-04-01 17:17:49 -0400 |
| commit | 031b31dfcc2b99836021d6e251c78a9fc339d444 (patch) | |
| tree | 4193ce7f3cd69f60a304e7d720baf943cf09da86 /app/views/matches/index.html.erb | |
| parent | cd6b94cfc989800d65acc0fbceeebe35da5be4af (diff) | |
| parent | 0f2b05889cba090e4824f62965ee8d131da09973 (diff) | |
Settled Merge Conflicts.
Diffstat (limited to 'app/views/matches/index.html.erb')
| -rw-r--r-- | app/views/matches/index.html.erb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb index d862d57..d463e50 100644 --- a/app/views/matches/index.html.erb +++ b/app/views/matches/index.html.erb @@ -7,6 +7,7 @@ <th>Tournament</th> <th>Name</th> <th>Winner</th> + <th>Remote</th> <th></th> <th></th> <th></th> @@ -21,9 +22,6 @@ <td><%= match.tournament %></td> <td><%= match.name %></td> <td><%= match.winner %></td> - <td><%= link_to 'Show', tournament_match_path(@tournament, match) %></td> - <td><%= link_to 'Edit', edit_tournament_match_path(@tournament, match) %></td> - <td><%= link_to 'Destroy', tournament_match_path(@tournament, match), method: :delete, data: { confirm: 'Are you sure?' } %></td> </tr> <% end %> </tbody> |