From f13446740cc09d6cc219bfd6e5e772ad8b7b7df9 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <me@rgrinberg.com>
Date: Tue, 24 Nov 2020 07:39:39 -0800
Subject: [PATCH] revert merlin update again

Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
---
 ocaml-lsp-server/vendor/merlin | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ocaml-lsp-server/vendor/merlin b/ocaml-lsp-server/vendor/merlin
index ce1718967..f85f5e88f 160000
--- a/ocaml-lsp-server/vendor/merlin
+++ b/ocaml-lsp-server/vendor/merlin
@@ -1 +1 @@
-Subproject commit ce171896797ad90fc5e261aded8266a621c141f5
+Subproject commit f85f5e88f3effd00901377b3a03ee028fe7a6682