diff options
| author | Yann Collet <cyan@fb.com> | 2018-01-14 05:09:02 (GMT) |
|---|---|---|
| committer | Yann Collet <cyan@fb.com> | 2018-01-14 05:09:02 (GMT) |
| commit | 151a50e16e558b9619b979ef1c0a525acc13ed92 (patch) | |
| tree | de2eace172cbef23f0f12392487104aafeee5960 /.gitattributes | |
| parent | 7628d9d15a399404d3ee4c0c07fcf0f6a2f39ede (diff) | |
| parent | e0e29cf09e12aa8e98275a736e98fba7eed93b3f (diff) | |
| download | lz4-151a50e16e558b9619b979ef1c0a525acc13ed92.zip lz4-151a50e16e558b9619b979ef1c0a525acc13ed92.tar.gz lz4-151a50e16e558b9619b979ef1c0a525acc13ed92.tar.bz2 | |
Merge branch 'master' into coverity_scan
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 6212bd4..9eb12c0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -19,3 +19,6 @@ # Windows *.bat text eol=crlf *.cmd text eol=crlf + +# .travis.yml merging +.travis.yml merge=ours |