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 /config | |
| 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 'config')
| -rw-r--r-- | config/routes.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/config/routes.rb b/config/routes.rb index 580ec72..4563a9a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,12 +7,6 @@ Leaguer::Application.routes.draw do resources :games - resources :pms - - resources :alerts - - resources :teams - resources :matches resources :tournaments do |