Merge from my devel branch

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

diff --git a/app/controllers/voter_controller.rb b/app/controllers/voter_controller.rb
old mode 100755 (executable)
new mode 100644 (file)
index 0e03a52..779e83f
--- a/app/controllers/voter_controller.rb
+++ b/app/controllers/voter_controller.rb
@@ -1,5 +1,5 @@
 class VoterController < ApplicationController
 class VoterController < ApplicationController

-  layout 'hc'
+  layout 'main'

   model :voter
   model :vote
   model :election
   model :voter
   model :vote
   model :election