From 26f03e57565cfdbca752ab9440e250b6c1067502 Mon Sep 17 00:00:00 2001
From: DanielVetter <DanielVetter@web>
Date: Sun, 12 Apr 2020 15:37:33 +0000
Subject: take out conflict markers. oops

---
 BoardOfDirectors/Elections.mdwn | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'BoardOfDirectors/Elections.mdwn')

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
-- 
cgit v1.2.3