diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 19:47:20 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 19:47:20 -0500 |
commit | 706392b7c4520382ddd8f827b31205c6b71f5320 (patch) | |
tree | 55444920bb49c5cc104e919737ebcda44eb45321 /app/views/teams/show.html.erb | |
parent | eebd00ba4692a6a285c9807705331ab924ce225f (diff) | |
parent | d72452a5965c0df32a13053ae86bcd529fc0fc9e (diff) |
Merge branch 'clean'
Conflicts:
app/controllers/tournaments_controller.rb
app/views/teams/show.html.erb
app/views/tournaments/index.html.erb
config/routes.rb
Diffstat (limited to 'app/views/teams/show.html.erb')
-rw-r--r-- | app/views/teams/show.html.erb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/views/teams/show.html.erb b/app/views/teams/show.html.erb index ab49d65..e41692a 100644 --- a/app/views/teams/show.html.erb +++ b/app/views/teams/show.html.erb @@ -1,2 +1,9 @@ +<p id="notice"><%= notice %></p> + +<p> + <strong>Match:</strong> + <%= @team.match %> +</p> + <%= link_to 'Edit', edit_team_path(@team) %> | <%= link_to 'Back', teams_path %> |