presentation merge

caltechlibrary · Nov 13, 2024 · 1220788 · 1220788
1 parent 1f51473
commit 1220788
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 16 deletions.
diff --git a/pagefind/pagefind-entry.json b/pagefind/pagefind-entry.json
@@ -1,5 +1 @@
-<<<<<<< HEAD
-{"version":"1.2.0","languages":{"en-US":{"hash":"en-US_de1023ad2158f","wasm":"en-US","page_count":13}}}
-=======
-{"version":"1.1.0","languages":{"en-US":{"hash":"en-US_314564d3ae21c","wasm":"en-US","page_count":13}}}
->>>>>>> 3307d26aba0c46858d4fa2d98b00e5a4a5471a73
+{"version":"1.2.0","languages":{"en-US":{"hash":"en-US_de1023ad2158f","wasm":"en-US","page_count":13}}}