fix mergre

leanprover-community · Jul 1, 2024 · 7fbd81c · 7fbd81c
1 parent 8739e13
commit 7fbd81c
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/lake-manifest.json b/lake-manifest.json
@@ -1,9 +1,10 @@
-{"version": "1.0.0",
+{"version": "1.1.0",
  "packagesDir": ".lake/packages",
  "packages":
  [{"url": "https://github.com/leanprover/lean4-cli",
    "type": "git",
    "subDir": null,
+   "scope": "",
    "rev": "a11566029bd9ec4f68a65394e8c3ff1af74c1a29",
    "name": "Cli",
    "manifestFile": "lake-manifest.json",
@@ -13,11 +14,8 @@
   {"url": "https://github.com/leanprover-community/batteries",
    "type": "git",
    "subDir": null,
-<<<<<<< HEAD
-   "rev": "54bb04c3119f24fde14b9068c4b2e69db52a1450",
-=======
-   "rev": "2506c85498141bc8ab3ee745bcb06021c3ed9a80",
->>>>>>> nightly-testing
+   "scope": "",
+   "rev": "2ead90d24b4fac3a05c9c4294daa39bd8686fb98",
    "name": "batteries",
    "manifestFile": "lake-manifest.json",
    "inputRev": "main",