merge

kim-em · kim-em · commit 6cfdd3d15d13 · 2025-09-18T22:05:43.000+10:00
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@
 /widget/dist
 /widget/node_modules
 /widget/*.log.json
+/widget/*.hash
 .direnv/
diff --git a/lakefile.lean b/lakefile.lean
@@ -6,7 +6,11 @@ package proofwidgets where
   buildArchive? := "ProofWidgets4.tar.gz"
   releaseRepo := "https://github.com/leanprover-community/ProofWidgets4"
 
+<<<<<<< HEAD
 require "leanprover-community" / "batteries" @ git "nightly-testing"
+=======
+require "leanprover-community" / "batteries" @ git "v4.24.0-rc1"
+>>>>>>> main
 
 def widgetDir : FilePath := "widget"
 
diff --git a/widget/package-lock.json.hash b/widget/package-lock.json.hash
