Merge pull request #2477 from Ckins/patch-1

shiftkey · web-flow · commit ba36ec305481 · 2017-09-17T09:10:45.000+08:00
Update OCaml.gitignore
diff --git a/OCaml.gitignore b/OCaml.gitignore
@@ -18,3 +18,6 @@ _build/
 # oasis generated files
 setup.data
 setup.log
+
+# Merlin configuring file for Vim and Emacs
+.merlin
