summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2020-05-07 14:29:20 -0400
committerÉric Araujo <merwok@netwok.org>2020-05-07 14:29:20 -0400
commite1be97b3261661af865a0157f755fdc728b9f1f7 (patch)
tree6094838c31cf413554a02ea8f56d36c8f6f82f24 /.gitattributes
parentce6685e1b4a6c240ce9382464b1e0055a33d2b4a (diff)
parent1722cbb7bf40ce9d3793faf38f63e9f00d577613 (diff)
downloadpyramid-e1be97b3261661af865a0157f755fdc728b9f1f7.tar.gz
pyramid-e1be97b3261661af865a0157f755fdc728b9f1f7.tar.bz2
pyramid-e1be97b3261661af865a0157f755fdc728b9f1f7.zip
merge master
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes5
1 files changed, 5 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..a446231f1
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,5 @@
+# Set the default behaviour, in case poeple don't have core.autocrlf set
+* text=auto
+
+# Always lf, this file size is checked in a test
+tests/fixtures/static/encoded.html text eol=lf