diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 02:45:22 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 02:45:22 -0400 |
| commit | 7d40d2ed8bd686b32ff9bc620936a72044a610bc (patch) | |
| tree | 4e46ac6a1fca51e272837ef0d8f5921f3991e914 /app/views/matches/show.html.erb | |
| parent | d3bee0f1ce0c5dc3fa741338bc6d9914e9e92787 (diff) | |
| parent | 07476fd9a2b942e8d6056804bb1cdbd5e9a1c528 (diff) | |
Merge branch 'clean2'
Conflicts:
app/controllers/tournaments_controller.rb
app/models/match.rb
app/views/matches/index.html.erb
app/views/matches/show.html.erb
app/views/tournaments/index.html.erb
app/views/tournaments/show.html.erb
Diffstat (limited to 'app/views/matches/show.html.erb')
| -rw-r--r-- | app/views/matches/show.html.erb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb index ba1ff9b..e7fe791 100644 --- a/app/views/matches/show.html.erb +++ b/app/views/matches/show.html.erb @@ -3,8 +3,8 @@ <%= @match.status %> </p> <p> - <strong>Tournament:</strong> - <%= @match.tournament.id %> + <strong>Tournament stage:</strong> + <%= @match.tournament_stage %> </p> <p> |