From: <mako@atdot.cc>
Date: Thu, 27 Nov 2008 20:12:03 +0000 (-0500)
Subject: merged in changes from live version
X-Git-Url: https://projects.mako.cc/source/selectricity-live/commitdiff_plain/05ebed925ae2b5e7bf2a599536ba7d7ac15ffbf7?ds=sidebyside

merged in changes from live version
---

05ebed925ae2b5e7bf2a599536ba7d7ac15ffbf7
diff --cc app/views/voter/review.rhtml
index 425c952,7ecaf5f..b831aef
--- a/app/views/voter/review.rhtml
+++ b/app/views/voter/review.rhtml
@@@ -28,8 -28,9 +28,9 @@@ preferred to least preferred:</p
  
    <p>If you choose, you will be able to go back<br />and change it up until
    the end of the voting period.</p>
 -
++  
    <p><%= button_to 'Discard This Vote', votepassword_url(
 -                   :action => 'index', :urlpassword => @voter.password) %></p>
 +                   :action => 'index', :urlpassword => @password) %></p>
  
    <p>You will be returned to the voting page to vote<br /> again, if you choose.</p>