diff options
| author | Yann Collet <cyan@fb.com> | 2018-01-14 08:21:43 (GMT) |
|---|---|---|
| committer | Yann Collet <cyan@fb.com> | 2018-01-14 08:21:43 (GMT) |
| commit | dfed9fa1d77f0434306d377c4da1f7191d3ba08a (patch) | |
| tree | fe501c735e9a7e0282e5670dfbd3bfcd44a4ece3 /.gitattributes | |
| parent | 5e7780d2d8394a5feb4fe5758c22e826b5cb689f (diff) | |
| download | lz4-dfed9fa1d77f0434306d377c4da1f7191d3ba08a.zip lz4-dfed9fa1d77f0434306d377c4da1f7191d3ba08a.tar.gz lz4-dfed9fa1d77f0434306d377c4da1f7191d3ba08a.tar.bz2 | |
restored .travisv1.8.1.2
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/.gitattributes b/.gitattributes index 9eb12c0..6212bd4 100644 --- a/.gitattributes +++ b/.gitattributes @@ -19,6 +19,3 @@ # Windows *.bat text eol=crlf *.cmd text eol=crlf - -# .travis.yml merging -.travis.yml merge=ours |