diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-28 09:37:52 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-28 09:37:52 -0400 |
| commit | f8e9b0349b82278c8fb015037e901dd5a77e30e7 (patch) | |
| tree | c54eae2919f7d6a8532527ec4db7b33c26b71a71 /app/views/games/index.html.erb | |
| parent | 8abfaf4ce71dff7294424a7cb37efe4db5e0d581 (diff) | |
| parent | e08e007a6c50e1959a29a9d18dec8c52146a233c (diff) | |
Merge branch 'clean2'
Conflicts:
app/controllers/tournaments_controller.rb
app/views/tournaments/_form.html.erb
app/views/tournaments/index.html.erb
app/views/tournaments/show.html.erb
Diffstat (limited to 'app/views/games/index.html.erb')
| -rw-r--r-- | app/views/games/index.html.erb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/views/games/index.html.erb b/app/views/games/index.html.erb index 565320c..f12253c 100644 --- a/app/views/games/index.html.erb +++ b/app/views/games/index.html.erb @@ -9,7 +9,6 @@ <th>Max players per team</th> <th>Min teams per match</th> <th>Max teams per match</th> - <th>Sampling method</th> <th>Scoring method</th> <th></th> <th></th> @@ -26,7 +25,6 @@ <td><%= game.max_players_per_team %></td> <td><%= game.min_teams_per_match %></td> <td><%= game.max_teams_per_match %></td> - <td><%= game.sampling_method %></td> <td><%= game.scoring_method %></td> <td><%= link_to 'Show', game %></td> <td><%= link_to 'Edit', edit_game_path(game) %></td> |