rebase

sanctuarycomputer · Nov 7, 2024 · 3f2de88 · 3f2de88
1 parent e6e0b5b
commit 3f2de88
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/templates/home_page.hbs b/templates/home_page.hbs
@@ -119,7 +119,7 @@
 
   // Make sure arguments are correctly typed. 
   renderHomepage(settings, homepageData, container);
-<<<<<<< HEAD
+  container.prepend(searchBarPlaceholder);
 </script>
 
 <script type="module">
@@ -133,7 +133,4 @@
 
   // Make sure arguments are correctly typed. 
   renderSideNav(settings, sideNavData, {}, container);
-=======
-  container.prepend(searchBarPlaceholder);
->>>>>>> d1cde96 (add mobile nav and hero search bars)
 </script>