Merge remote-tracking branch 'origin/master'

PDAL · Feb 23, 2016 · 00b4171 · 00b4171
2 parents 016a231 + 537fbbf
commit 00b4171
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -14,3 +14,8 @@
 # Denote all files that are truly binary and should not be modified.
 *.las binary
 *.laz binary
+
+# Declare files that must never have CRLF line endings on checkout,
+# otherwise tests will fail.
+test/data/bpf/bundle1 text eol=lf
+test/data/bpf/bundle2 text eol=lf