Merge into jdong

diff --git a/app/views/election/edit_candidates.rhtml b/app/views/election/edit_candidates.rhtml
index 756554dcd83950c18a42da63412e19ac75a16401..dcd601a9cf72b3501061a3b18bfb83126e30367b 100644 (file)
--- a/app/views/election/edit_candidates.rhtml
+++ b/app/views/election/edit_candidates.rhtml
@@ -4,7 +4,6 @@
 
 <% unless @election.candidates.empty? %>
   <p>The following are valid options or candidates in this election:</p>
-1;3A
 
   <% @election.candidates.each do |candidate| %>
     <% @current_candidate = candidate %>

diff --git a/db/schema.rb b/db/schema.rb
index 6c038deadbd2983e1fb2073265ec989248421809..590425d670859ee07aab24761a30d00f5c780eb2 100644 (file)
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -74,11 +74,10 @@ ActiveRecord::Schema.define() do
   create_table "voters", :force => true do |t|
     t.column "email",       :string,  :limit => 100
     t.column "password",    :string,  :limit => 100
-    t.column "contacted",   :integer, :limit => 4,   :default => 0,  :null => false
-    t.column "election_id", :integer,                                :null => false
+    t.column "contacted",   :integer, :limit => 4,   :default => 0, :null => false
+    t.column "election_id", :integer,                               :null => false
     t.column "session_id",  :string,  :limit => 32
     t.column "ipaddress",   :string,  :limit => 32
-    t.column "type",        :string,  :limit => 100, :default => "", :null => false
   end
 
   add_index "voters", ["election_id"], :name => "fk_election_voter"