Resolve conflicts (hopefully)

Merge branch 'main' of https://github.com/Cloud-SPAN/cloud-span-quarto-site # Conflicts: # docs/site_libs/bootstrap/bootstrap.min.css # docs/sitemap.xml # index.qmd
Cloud-SPAN · Sep 15, 2023 · 221f1ca · 221f1ca
2 parents f437289 + 3f1e44b
commit 221f1ca
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 33 deletions.
diff --git a/docs/index.html b/docs/index.html
@@ -133,6 +133,8 @@
 <div class="h2">
 <p>Challenges in Environmental ’Omics</p>
 </div>
+<p>&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD</p>
+======= &gt;&gt;&gt;&gt;&gt;&gt;&gt; 3f1e44b3d116cdb7e483bbe1e209f88cdd9c60f8
 <section class="side-padding">
 <div class="responsive gallery">
 <a target="_blank" href="https://cloud-span.github.io/cloud-span-quarto-site/blogs.html"> <img src="images/software_icon.png" alt="Software" width="300" height="auto"> </a>

diff --git a/docs/sitemap.xml b/docs/sitemap.xml
@@ -30,38 +30,6 @@
   </url>
   <url>
     <loc>https://cloud-span.github.io/cloud-span-quarto-site/index.html</loc>
-    <lastmod>2023-09-14T16:14:20.247Z</lastmod>
-  </url>
-  <url>
-    <loc>https://cloud-span.github.io/cloud-span-quarto-site/self_study/Create Your Own AWS Instance/index.html</loc>
-    <lastmod>2023-09-14T09:36:15.914Z</lastmod>
-  </url>
-  <url>
-    <loc>https://cloud-span.github.io/cloud-span-quarto-site/self_study/Genomics/index.html</loc>
-    <lastmod>2023-09-14T09:36:17.275Z</lastmod>
-  </url>
-  <url>
-    <loc>https://cloud-span.github.io/cloud-span-quarto-site/self_study/Metagenomics for Microbiologists/index.html</loc>
-    <lastmod>2023-09-14T09:36:18.711Z</lastmod>
-  </url>
-  <url>
-    <loc>https://cloud-span.github.io/cloud-span-quarto-site/self_study/Prenomics/index.html</loc>
-    <lastmod>2023-09-14T09:36:20.143Z</lastmod>
-  </url>
-  <url>
-    <loc>https://cloud-span.github.io/cloud-span-quarto-site/self_study_courses.html</loc>
-    <lastmod>2023-09-14T09:36:21.984Z</lastmod>
-  </url>
-  <url>
-    <loc>https://cloud-span.github.io/cloud-span-quarto-site/upcoming/Core R/index.html</loc>
-    <lastmod>2023-09-14T09:36:23.463Z</lastmod>
-  </url>
-  <url>
-    <loc>https://cloud-span.github.io/cloud-span-quarto-site/upcoming/NERC Metagenomics/index.html</loc>
-    <lastmod>2023-09-14T09:36:25.060Z</lastmod>
-  </url>
-  <url>
-    <loc>https://cloud-span.github.io/cloud-span-quarto-site/upcoming_courses.html</loc>
-    <lastmod>2023-09-14T09:36:26.775Z</lastmod>
+    <lastmod>2023-09-15T21:14:39.630Z</lastmod>
   </url>
 </urlset>
diff --git a/index.qmd b/index.qmd
@@ -27,7 +27,10 @@ We offer Diversity Scholarships to cover travel and/or childcare to enable membe
 ::: {.h2}
 Challenges in Environmental 'Omics
 :::
+<<<<<<< HEAD
 
+=======
+>>>>>>> 3f1e44b3d116cdb7e483bbe1e209f88cdd9c60f8
 <section class="side-padding">
    <div class="responsive gallery">
    <a target="_blank" href="https://cloud-span.github.io/cloud-span-quarto-site/blogs.html">