diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-04 21:07:32 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-04 21:07:32 -0400 |
| commit | 1cca0b2c418d1c4a31a27c98d7b0951545303d2c (patch) | |
| tree | 889ae82c823c87c33438c9b3f40c67a5036698de /config | |
| parent | 1627387966a4186a924bafd80cbd84c0861142b5 (diff) | |
| parent | b43bab15521c7c511ab7012bd137daa0e85bb95b (diff) | |
Merge branch 'clean2'
Conflicts:
config/routes.rb
db/schema.rb
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/config/routes.rb b/config/routes.rb index dc0325a..3a23a68 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,4 @@ Leaguer::Application.routes.draw do - resources :remote_usernames - resources :sessions, only: [:new, :create, :destroy] resources :users |