summaryrefslogtreecommitdiff
path: root/BoardOfDirectors/Elections.mdwn
diff options
context:
space:
mode:
authorDanielVetter <DanielVetter@web>2020-04-12 15:35:33 +0000
committerIkiWiki <ikiwiki.info>2020-04-12 15:35:33 +0000
commitaaa5c3b992c9b9330fbb6c14d2c7b03f6e0c9b0b (patch)
tree0d472d18579a04d25f860ef53ee66230b5dd919c /BoardOfDirectors/Elections.mdwn
parent65c44f870ce9579948f1e0b731b3104761bc4176 (diff)
Update voting mail to new membership system
Diffstat (limited to 'BoardOfDirectors/Elections.mdwn')
-rw-r--r--BoardOfDirectors/Elections.mdwn8
1 files changed, 6 insertions, 2 deletions
diff --git a/BoardOfDirectors/Elections.mdwn b/BoardOfDirectors/Elections.mdwn
index 632c848d..71470c93 100644
--- a/BoardOfDirectors/Elections.mdwn
+++ b/BoardOfDirectors/Elections.mdwn
@@ -183,9 +183,13 @@ Here are some instructions on how to cast your vote:
each preference level.
Note that you are NOT required to select your preferences for all
+<<<<<<< HEAD
$NUM_OPEN_SEATS positions. You can leave more than one blank.
+=======
+ $NUM_CANDIDATES candidates. You can leave more than one blank.
+>>>>>>> c28ec8dc5647b24365d861c957d9865313b384d0
-5. For the By-laws: If you approve of the new By-laws, select the "Yes"
+3. For the By-laws: If you approve of the new By-laws, select the "Yes"
radio button. If you do not approve of the new By-laws, select the
"No" radio button. If you wish to abstain from this question, select
the "Abstain" radio button.
@@ -196,7 +200,7 @@ Here are some instructions on how to cast your vote:
Note that answering this question is required for your vote to be
validated.
-6. After you have completed your ballot, click the "Vote" button. Note
+4. After you have completed your ballot, click the "Vote" button. Note
that once you click this button, your votes will be cast and you will
not be able to make further changes, so please make sure you are
satisfied with your votes before clicking the "Vote" button.