Merge pull request #383 from voodoos/master

rgrinberg · web-flow · commit f2303a7e3e51 · 2021-03-04T23:20:27.000-08:00
Parser fix in Merlin (generated files were wrongly pushed)
diff --git a/ocaml-lsp-server/vendor/merlin b/ocaml-lsp-server/vendor/merlin
@@ -1 +1 @@
-Subproject commit 0e3725483390fe557c60bc3f30d42f763fb0e019
+Subproject commit b028c281d142b5a01a2f4811baffdde07f999aff
