diff options
| author | AndrewMurrell <amurrel@purdue.edu> | 2014-03-06 22:34:08 -0500 |
|---|---|---|
| committer | AndrewMurrell <amurrel@purdue.edu> | 2014-03-06 22:34:08 -0500 |
| commit | 3ce5876375cbb3057ffc96e2886ba57cbd875dc9 (patch) | |
| tree | e59dc46b293cdcd4ad8ad5b33bd4703f65adb0d9 /app/views/tournaments/show.html.erb | |
| parent | ce8b05ed8fa3466c727269daa47ba7df672fdca1 (diff) | |
| parent | 70bae69d731afc5300ffa5b176732ebe27d0810f (diff) | |
Fixed some merge errors in show.html.erb
Diffstat (limited to 'app/views/tournaments/show.html.erb')
| -rw-r--r-- | app/views/tournaments/show.html.erb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb index a04c852..c3a40e7 100644 --- a/app/views/tournaments/show.html.erb +++ b/app/views/tournaments/show.html.erb @@ -12,6 +12,11 @@ </p> <p> + <strong>Status:</strong> + <%= @tournament.status %> +</p> + +<p> <strong>Min players per team:</strong> <%= @tournament.min_players_per_team %> </p> @@ -54,4 +59,5 @@ <%= link_to 'Edit', edit_tournament_path(@tournament) %> | <%= link_to 'Back', tournaments_path %> -<% end %>
\ No newline at end of file +<% end %> + |