From f41c8d30c44dd83dafde87691a97509707addb21 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <me@rgrinberg.com>
Date: Fri, 11 Feb 2022 15:05:42 -0700
Subject: [PATCH] fix: ppx execution

and prepare 1.10.1

ps-id: F20138AE-2D28-44B8-8619-F67C8C5F7895
---
 CHANGES.md                     | 6 ++++++
 ocaml-lsp-server/vendor/merlin | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index d81ee3066..2fe809801 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,9 @@
+# 1.10.1
+
+## Fixes
+
+- Fix executing ppx executables
+
 # 1.10.0
 
 ## Features
diff --git a/ocaml-lsp-server/vendor/merlin b/ocaml-lsp-server/vendor/merlin
index 813dbc037..4e8344b29 160000
--- a/ocaml-lsp-server/vendor/merlin
+++ b/ocaml-lsp-server/vendor/merlin
@@ -1 +1 @@
-Subproject commit 813dbc0371f46c42255811baabd3cc67b7b0283e
+Subproject commit 4e8344b290e3f7242c1886382de4d95a949348a9