From 162aa667132c897c2b7b0fbe425fc3efdabe38f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ulysse=20G=C3=A9rard?= <thevoodoos@gmail.com>
Date: Tue, 26 Nov 2024 17:15:46 +0100
Subject: [PATCH] Prepare release 4.18-414

---
 CHANGES.md  | 5 +++--
 merlin.opam | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 79b9a484e..ab2a6b5b6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,6 @@
-unreleased
-==========
+merlin 4.18
+===========
+Tue Nov 26 17:30:42 CET 2024
 
   + merlin binary
     - Respect the `EXCLUDE_QUERY_DIR` configuration directive when looking for
diff --git a/merlin.opam b/merlin.opam
index afa0566db..ce139c5f5 100644
--- a/merlin.opam
+++ b/merlin.opam
@@ -14,7 +14,7 @@ depends: [
   "ocaml" {>= "4.14" & < "4.15"}
   "dune" {>= "2.9.0"}
   "merlin-lib" {= version}
-  "dot-merlin-reader" {>= "4.17"}
+  "dot-merlin-reader" {= "4.17.1-414"}
   "yojson" {>= "2.0.0"}
   "conf-jq" {with-test}
   "ppxlib" {with-test}