Skip to content

Commit 6e62bd3

Browse files
committed
Merge branch 'next'
2 parents 4f5d2c3 + af409be commit 6e62bd3

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

.drom

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ version:0.9.0
55

66
# hash of toml configuration files
77
# used for generation of all files
8-
1a7f438a9a5be7f02e5bef42dc8bf870:.
8+
50cc88a47a8c568376ce2ed25748d705:.
99
# end context for .
1010

1111
# begin context for .github/workflows/workflow.yml
@@ -105,7 +105,7 @@ e850a13c004f963e9f5a568eac93c217:dune
105105

106106
# begin context for dune-project
107107
# file dune-project
108-
b5f0d96d72a9cbd9f919146017fd56ce:dune-project
108+
20de9322a6d206231f187ab93f973e3f:dune-project
109109
# end context for dune-project
110110

111111
# begin context for opam/drom.opam

dune-project

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@
8181
)
8282
)
8383

84-
; the next line is deprecated for recent versions of dune, but
85-
; can still be added into the dune-project-trailer field
86-
;(allow_approximate_merlin)
8784

85+
86+
; add this in dune-project-trailer if you need it, as it is not used
87+
; by the most recent versions of dune
88+
;(allow_approximate_merlin)

src/drom_lib/versionCompare.ml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,4 +217,3 @@ let gt x y = compare x y > 0
217217
let gte x y = compare x y >= 0
218218

219219
let ( >= ) = gte
220-

src/drom_lib/versionCompare.mli

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,3 @@ val ( >= ) : string -> string -> bool
4242

4343
val gt : string -> string -> bool
4444
val gte : string -> string -> bool
45-

0 commit comments

Comments
 (0)