fix merge

caltechlibrary · Feb 27, 2024 · 10db0e9 · 10db0e9
1 parent 618e74a
commit 10db0e9
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 13 deletions.
diff --git a/.nojekyll b/.nojekyll
diff --git a/pagefind/fragment/unknown_c65aa29.pf_fragment b/pagefind/fragment/unknown_c65aa29.pf_fragment
diff --git a/pagefind/pagefind-entry.json b/pagefind/pagefind-entry.json
@@ -1,13 +1 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-{"version":"0.12.0","languages":{"unknown":{"hash":"unknown_5127cb4ee145dd3","wasm":null,"page_count":199}}}
-=======
-{"version":"0.12.0","languages":{"unknown":{"hash":"unknown_b4a2306283c7381","wasm":null,"page_count":199}}}
->>>>>>> 6539c660a73636621d98fcdef7ce3b34342527d4
-=======
-{"version":"1.0.4","languages":{"unknown":{"hash":"unknown_d4cc11affe65b92","wasm":null,"page_count":118}}}
->>>>>>> 72e3344e6784ac9741fd1c93bf9f4da9533e6f27
-=======
-{"version":"1.0.4","languages":{"unknown":{"hash":"unknown_7ca3eb45387e94e","wasm":null,"page_count":199}}}
->>>>>>> 393cfad11b7cfa42d603c7873d9cfef63892be3c
+{"version":"1.0.4","languages":{"unknown":{"hash":"unknown_136bfd6c27d2e01","wasm":null,"page_count":199}}}
diff --git a/pagefind/pagefind.unknown_136bfd6c27d2e01.pf_meta b/pagefind/pagefind.unknown_136bfd6c27d2e01.pf_meta