added yaml_db plugin

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

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 1387b29b10dd1e53e8b7252ef258164ec9e2ebf4..bdd11e8c425f98ce927c8d950a5fbdd7977b4c91 100644 (file)
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -2,19 +2,8 @@
 # Copyright (C) 2007, 2008 Benjamin Mako Hill <mako@atdot.cc>
 # Copyright (C) 2007 Massachusetts Institute of Technology
 #
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public
-# License along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
+# This program is free software. Please see the COPYING file for
+# details.
 
 # Filters added to this controller will be run for all controllers in
 # the application.  Likewise, all the methods added will be available
@@ -47,7 +36,6 @@ class ApplicationController < ActionController::Base
 
   #both election_controller and quickvote_controller need this method
   def sort_candidates
-    
     @vote = Vote.find(params[:id])
     
     @vote.rankings.each do |ranking|