diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 22:17:36 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 22:17:36 -0500 |
| commit | 5f2247dd1e701a91fb0359bf7265bdadd5486a60 (patch) | |
| tree | 8966f53e304731faf26b19230439f831b215d3f1 /app/views/matches/show.html.erb | |
| parent | 4a91128f6fe20d95b6692abaa5e6c4dc92418b46 (diff) | |
| parent | 2bfc17c39f9b8b5ea71d36d2d5f041295f24192f (diff) | |
Merge branch 'master' of github.com:LukeShu/leaguer
Conflicts:
config/routes.rb
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 9c9cbb4..e95cd07 100644 --- a/app/views/matches/show.html.erb +++ b/app/views/matches/show.html.erb @@ -8,5 +8,5 @@ <%= @match.name %> </p> -<%= link_to 'Edit', edit_match_path(@match) %> | -<%= link_to 'Back', matches_path %> +<%= link_to 'Edit', edit_tournament_match_path(@tournament, @match) %> | +<%= link_to 'Back', tournament_matches_path %> |