summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorTom Kelly <ctk21@cl.cam.ac.uk>2021-12-20 15:24:30 +0000
committerTom Kelly <ctk21@cl.cam.ac.uk>2021-12-20 15:24:30 +0000
commit03db0a408f7d8e4eeae25d7f6cadc362d981888f (patch)
tree1806f06e4f4db21c17b4369d3c1e76abdd9017fa /.gitattributes
parent47dd6c55bfd20c9a4353bc37af543a37c405b169 (diff)
parent18c4d16b3b80388f5b77dcc5a268c33eceb37ebe (diff)
downloadocaml-03db0a408f7d8e4eeae25d7f6cadc362d981888f.tar.gz
Merge commit '18c4d16b3b80388f5b77dcc5a268c33eceb37ebe' into 5.00_rebase_to_pr
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes2
1 files changed, 0 insertions, 2 deletions
diff --git a/.gitattributes b/.gitattributes
index f7578b53b1..ab3643be69 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -187,8 +187,6 @@ tools/ocaml-objcopy-macosx text eol=lf
tools/ocamlsize text eol=lf
tools/pre-commit-githook text eol=lf
tools/markdown-add-pr-links.sh text eol=lf
-runtime/caml/m.h.in text eol=lf
-runtime/caml/s.h.in text eol=lf
runtime/caml/compatibility.h typo.long-line=may
runtime/caml/sizeclasses.h typo.missing-header typo.white-at-eol