summaryrefslogtreecommitdiff
path: root/BoardOfDirectors/Elections.mdwn
diff options
context:
space:
mode:
authorDanielVetter <DanielVetter@web>2020-04-12 15:37:33 +0000
committerIkiWiki <ikiwiki.info>2020-04-12 15:37:33 +0000
commit26f03e57565cfdbca752ab9440e250b6c1067502 (patch)
tree974415a8caab629630b023a217022383ef2a7871 /BoardOfDirectors/Elections.mdwn
parentaaa5c3b992c9b9330fbb6c14d2c7b03f6e0c9b0b (diff)
take out conflict markers. oops
Diffstat (limited to 'BoardOfDirectors/Elections.mdwn')
-rw-r--r--BoardOfDirectors/Elections.mdwn4
1 files changed, 0 insertions, 4 deletions
diff --git a/BoardOfDirectors/Elections.mdwn b/BoardOfDirectors/Elections.mdwn
index 71470c93..96335401 100644
--- a/BoardOfDirectors/Elections.mdwn
+++ b/BoardOfDirectors/Elections.mdwn
@@ -183,11 +183,7 @@ 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
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