aboutsummaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorTalia Ringer2019-05-22 16:09:51 -0400
committerTalia Ringer2019-05-22 16:09:51 -0400
commit577db38704896c75d1db149f6b71052ef47202be (patch)
tree946afdb361fc9baaa696df7891d0ddc03a4a8594 /.gitattributes
parent7eefc0b1db614158ed1b322f8c6e5601e3995113 (diff)
parente9a5fe993ba36e22316ac9f6ef0564f38a3eb4f9 (diff)
Merge remote-tracking branch 'origin/master' into stm+doc_hook
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index 58b1a31d36..260e3f96b6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -54,6 +54,7 @@ dune* whitespace=blank-at-eol,tab-in-indent
.gitattributes whitespace=blank-at-eol,tab-in-indent
_CoqProject whitespace=blank-at-eol,tab-in-indent
Dockerfile whitespace=blank-at-eol,tab-in-indent
+00000-title.rst -whitespace
# tabs are allowed in Makefiles.
Makefile* whitespace=blank-at-eol