diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 15:56:06 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 15:56:06 -0400 |
| commit | 45c5d311492ef98ed702beaf043d289a705a5e0b (patch) | |
| tree | c0bea2e65d21127a1fd34a245b5bb7fc47123bb0 /app/views/teams/index.html.erb | |
| parent | 9d226fcd27b6c2470edf718ad36a262348891470 (diff) | |
| parent | c927cd7c043d982f8ffb51c8a78288d88d825d82 (diff) | |
Merge branch 'clean2'
Conflicts:
app/models/team.rb
app/views/matches/index.html.erb
app/views/matches/show.html.erb
Diffstat (limited to 'app/views/teams/index.html.erb')
| -rw-r--r-- | app/views/teams/index.html.erb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/views/teams/index.html.erb b/app/views/teams/index.html.erb index 6a3188d..b077e10 100644 --- a/app/views/teams/index.html.erb +++ b/app/views/teams/index.html.erb @@ -3,7 +3,6 @@ <table> <thead> <tr> - <th>Match</th> <th></th> <th></th> <th></th> @@ -13,7 +12,6 @@ <tbody> <% @teams.each do |team| %> <tr> - <td><%= team.match %></td> <td><%= link_to 'Show', team %></td> <td><%= link_to 'Edit', edit_team_path(team) %></td> <td><%= link_to 'Destroy', team, method: :delete, data: { confirm: 'Are you sure?' } %></td> |