merge everything back from mainline branch

[selectricity-live] / app / views / election / _overview_form.rhtml

diff --git a/app/views/election/_overview_form.rhtml b/app/views/election/_overview_form.rhtml
index 8d1861d00b56b3d754ab1f54c4dd2f5692cbfccb..be90de6593f3944d0c87accd0dff4e792f6dec2a 100644 (file)
--- a/app/views/election/_overview_form.rhtml
+++ b/app/views/election/_overview_form.rhtml
@@ -28,5 +28,6 @@
 
 <p><label for="election_election_method">Should results be visible before end of election?</label>
 <%= check_box :election, :early_results%></p>
 
 <p><label for="election_election_method">Should results be visible before end of election?</label>
 <%= check_box :election, :early_results%></p>

+

 <!--[eoform:election]-->
 
 <!--[eoform:election]-->