revert merlin update again

rgrinberg · rgrinberg · commit f13446740cc0 · 2020-11-24T07:39:39.000-08:00
Signed-off-by: Rudi Grinberg &lt;me@rgrinberg.com&gt;
diff --git a/ocaml-lsp-server/vendor/merlin b/ocaml-lsp-server/vendor/merlin
@@ -1 +1 @@
-Subproject commit ce171896797ad90fc5e261aded8266a621c141f5
+Subproject commit f85f5e88f3effd00901377b3a03ee028fe7a6682
