Merge branch 'ocsigen:master' into master

ocsigen · Dec 18, 2024 · 6c08cd5 · 6c08cd5
2 parents f22dc1c + 51a32b7
commit 6c08cd5
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 40 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,15 +5,6 @@ src/unix/discover_arguments
 # OPAM 2.0 local switches.
 _opam
 
-# NPM.
-node_modules/
-package-lock.json
-# package-lock.json should probably be committed once we know what we're doing.
-
-# esy
-_esy
-esy.lock
-
 # Coverage analysis.
 bisect*.out
 _coverage/

diff --git a/esy.json b/esy.json
diff --git a/lwt_retry.opam b/lwt_retry.opam
@@ -16,7 +16,6 @@ depends: [
   "bisect_ppx" {with-test}
   "odoc" {with-doc}
 ]
-dev-repo: "git+https://github.com/ocsigen/lwt.git"
 build: [
   ["dune" "subst"] {dev}
   [
@@ -31,4 +30,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
-
+dev-repo: "git+https://github.com/ocsigen/lwt.git"
diff --git a/lwt_retry.opam.template b/lwt_retry.opam.template