Resolve merge conflict

diff --git a/2022/includes/header.html b/2022/includes/header.html
index 616eb772341d32a4f417b18eed0a64ea73936496..4802b325e3e83129aebd5d0174e05f0250843a90 100644 (file)
--- 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 cb8e1b243929430e3e20b056eb998527b94c1ab1..985aa1fef3fbaf07af432f6734f2e122374693e8 100644 (file)
--- 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 90893668295aafd9e24ef8476ad12daebcefeb0a..6ada61841fbe957dea78b135d770641c663ba2e1 100644 (file)
--- 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 0f9aaa1799fe13404f0edf69d3a14e179eb5378e..4455ef804c50db28ed57f3ab8d15d0df0d403cef 100755 (executable)
--- 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>