merge everything back from mainline branch

[selectricity-live] / app / models / election.rb

diff --git a/app/models/election.rb b/app/models/election.rb
index 9ce89b9b6baae86009ebc4b7ebdaef096e4dd970..a3cf8e47c1b3db7ee0e74908eb71f0fcd5798c46 100644 (file)
--- a/app/models/election.rb
+++ b/app/models/election.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.
 
 class Election < ActiveRecord::Base
   has_many :candidates