diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-23 21:03:17 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-23 21:03:17 -0400 |
| commit | c93c9f837c09ba0385690fb1a228a9c506ca120c (patch) | |
| tree | 19f115b0bc62fefc45f9c25ec4beeefee6429c8b /app/controllers | |
| parent | 9003a9099719a771fbbb9d2e8a4bfb093f35929a (diff) | |
| parent | 933199499f9adfa0347783c538a10b88ffb1b98b (diff) | |
Merge branch 'clean2'
Conflicts:
app/assets/stylesheets/static.css.scss
app/controllers/static_controller.rb
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/main_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/static_controller.rb | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb index 6519d7b..0ba4d94 100644 --- a/app/controllers/main_controller.rb +++ b/app/controllers/main_controller.rb @@ -1,2 +1,4 @@ class MainController < ApplicationController + def homepage + end end diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb deleted file mode 100644 index 6fc9490..0000000 --- a/app/controllers/static_controller.rb +++ /dev/null @@ -1,4 +0,0 @@ -class StaticController < ApplicationController - def homepage - end -end |