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 /config/routes.rb | |
| parent | ce8b05ed8fa3466c727269daa47ba7df672fdca1 (diff) | |
| parent | 70bae69d731afc5300ffa5b176732ebe27d0810f (diff) | |
Fixed some merge errors in show.html.erb
Diffstat (limited to 'config/routes.rb')
| -rw-r--r-- | config/routes.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/routes.rb b/config/routes.rb index a14c11a..5c5bece 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -11,13 +11,13 @@ Leaguer::Application.routes.draw do resources :alerts - resources :teams + resource :server, only: [:show, :edit, :update] + resources :teams resources :tournaments do resources :matches end - resource :server, only: [:show, :edit, :update] root to: 'static#homepage' |