merge nightly-testing

leanprover-community · Jul 1, 2024 · 8739e13 · 8739e13
2 parents 66e1314 + 418331c
commit 8739e13
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/ImportGraph/Lean/Name.lean b/ImportGraph/Lean/Name.lean
@@ -6,7 +6,6 @@ Authors: Jon Eugster
 import Lean.Data.Name
 import Lean.CoreM
 import Batteries.Data.HashMap.Basic
-import Batteries.Lean.Name
 import Batteries.Lean.SMap
 import Lean.Meta.Match.MatcherInfo
 

diff --git a/lake-manifest.json b/lake-manifest.json
@@ -13,7 +13,11 @@
   {"url": "https://github.com/leanprover-community/batteries",
    "type": "git",
    "subDir": null,
+<<<<<<< HEAD
    "rev": "54bb04c3119f24fde14b9068c4b2e69db52a1450",
+=======
+   "rev": "2506c85498141bc8ab3ee745bcb06021c3ed9a80",
+>>>>>>> nightly-testing
    "name": "batteries",
    "manifestFile": "lake-manifest.json",
    "inputRev": "main",