From cfd3c144b1a3b01833e059e9f0a7280335964d92 Mon Sep 17 00:00:00 2001
From: Michael McMahon <michael@fsf.org>
Date: Mon, 14 Nov 2022 16:41:50 -0500
Subject: [PATCH] Resolve merge conflict

---
 2022/includes/header.html       |  6 +++---
 2022/includes/join-list.html    | 10 +++++-----
 2022/includes/live_sidebar.html |  8 ++++----
 2022/sponsors/index.html        |  1 -
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/2022/includes/header.html b/2022/includes/header.html
index 616eb772..4802b325 100644
--- a/2022/includes/header.html
+++ b/2022/includes/header.html
@@ -4,9 +4,9 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
-    <link href="/2022/assets/css/bootstrap.min.css" rel="stylesheet" media="screen" />
-    <link href="/2022/assets/css/jquery-ui-1.9.0.custom.css" rel="stylesheet" media="screen" />
-    <link href="/2022/assets/css/custom.css" rel="stylesheet" media="screen" />
+    <link href="/2022/assets/css/bootstrap.min.css" rel="stylesheet" media="screen">
+    <link href="/2022/assets/css/jquery-ui-1.9.0.custom.css" rel="stylesheet" media="screen">
+    <link href="/2022/assets/css/custom.css" rel="stylesheet" media="screen">
     <link href="/2022/assets/img/favicon.ico" rel="shortcut icon">
 
 	<script>
diff --git a/2022/includes/join-list.html b/2022/includes/join-list.html
index cb8e1b24..985aa1fe 100644
--- a/2022/includes/join-list.html
+++ b/2022/includes/join-list.html
@@ -5,11 +5,11 @@
         method="post" name="Edit" id="Edit">
     <div>
       <input name="postURL" type="hidden"
-             value="https://libreplanet.org/2022/confirmation.html" />
+             value="https://libreplanet.org/2022/confirmation.html">
       <input name="cancelURL" type="hidden"
-             value="https://my.fsf.org/civicrm/profile?reset=1&amp;gid=507" />
-      <input name="add_to_group" type="hidden" value="619" />
-      <input name="_qf_default" type="hidden" value="Edit:cancel" />
+             value="https://my.fsf.org/civicrm/profile?reset=1&amp;gid=507">
+      <input name="add_to_group" type="hidden" value="619">
+      <input name="_qf_default" type="hidden" value="Edit:cancel">
     </div>
 
     <div id="crm-container" lang="en" xml:lang="en">
@@ -40,7 +40,7 @@
           <label class="lp-label-news">
             <input id="group_25"
                    name="group[25]" type="checkbox" value="1"
-                   class="checkbox" />
+                   class="checkbox">
 			<span class="text-muted">Also join the FSF's newsletter</span>
           </label>
           <p class="help-block">
diff --git a/2022/includes/live_sidebar.html b/2022/includes/live_sidebar.html
index 90893668..6ada6184 100644
--- a/2022/includes/live_sidebar.html
+++ b/2022/includes/live_sidebar.html
@@ -100,11 +100,11 @@
 		<input name="entryURL" type="hidden"
 	           value="https://my.fsf.org/civicrm/profile/create?gid=507&amp;reset=1/update?action=update&amp;amp;id=507&amp;amp;reset=1&amp;amp;context=field"
 	           />
-		<input name="postURL" type="hidden" value="https://libreplanet.org/2022/confirmation.html" />
+		<input name="postURL" type="hidden" value="https://libreplanet.org/2022/confirmation.html">
 		<input name="cancelURL" type="hidden"
-	           value="https://my.fsf.org/civicrm/profile?reset=1&amp;gid=507" />
-		<input name="add_to_group" type="hidden" value="619" />
-		<input name="_qf_default" type="hidden" value="Edit:cancel" />
+	           value="https://my.fsf.org/civicrm/profile?reset=1&amp;gid=507">
+		<input name="add_to_group" type="hidden" value="619">
+		<input name="_qf_default" type="hidden" value="Edit:cancel">
       </div>
 
       <div class="crm-profile-name-interested_in_libreplanet_507">
diff --git a/2022/sponsors/index.html b/2022/sponsors/index.html
index 0f9aaa17..4455ef80 100755
--- a/2022/sponsors/index.html
+++ b/2022/sponsors/index.html
@@ -1,4 +1,3 @@
-
 <!--#include virtual="/2022/includes/header.html"-->
 
 <title>LibrePlanet &mdash; Exhibitor Hall</title>
-- 
2.25.1