Merge pull request #2477 from Ckins/patch-1

Update OCaml.gitignore

Merge pull request #2477 from Ckins/patch-1
Update OCaml.gitignore
ba36ec30 · Brendan Forster · GitHub · 63267921 · 14a95b9b · ba36ec30
Commit ba36ec30 authored Sep 17, 2017 by Brendan Forster Committed by GitHub Sep 17, 2017
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

OCaml.gitignore OCaml.gitignore +3 -0

No files found.
--- 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