diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2017-10-12 16:12:25 +0300 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2017-10-12 16:12:25 +0300 |
commit | 122003917530f3fc07e8fee3716d5df5d2d964e7 (patch) | |
tree | 0e600370c10e86c486ee74d5eae44a5c07d39adf /vendor/gitignore/OCaml.gitignore | |
parent | 1e4b75ba40570a3e96e1999e375a120c4ba8b346 (diff) |
Update templates via:
bin/rake gitlab:update_templates
Diffstat (limited to 'vendor/gitignore/OCaml.gitignore')
-rw-r--r-- | vendor/gitignore/OCaml.gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/vendor/gitignore/OCaml.gitignore b/vendor/gitignore/OCaml.gitignore index f7817ae5c36..da0b20424a0 100644 --- a/vendor/gitignore/OCaml.gitignore +++ b/vendor/gitignore/OCaml.gitignore @@ -18,3 +18,6 @@ _build/ # oasis generated files setup.data setup.log + +# Merlin configuring file for Vim and Emacs +.merlin |