Merge pull request github#2477 from Ckins/patch-1

Update OCaml.gitignore
NoPodi · Sep 17, 2017 · ba36ec3 · ba36ec3
2 parents 6326792 + 14a95b9
commit ba36ec3
Showing 1 changed file with 3 additions and 0 deletions.
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