Merge from jdong

[selectricity-live] / app / controllers / application.rb

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 8c6f8aeabfc803bbd538516f06365afe69e90578..9b4803092dfc48e4c3ed6a006204de60ae39323e 100644 (file)
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -4,6 +4,6 @@
 class ApplicationController < ActionController::Base
   include AuthenticatedSystem
   helper :user
-  model :user
+  require_dependency "user"
   
 end