mirror of
https://github.com/fmtlib/fmt.git
synced 2024-12-04 15:20:06 +00:00
Keep our .travis.yml during merge
because it contains Coverity Scan configuration.
This commit is contained in:
parent
b634309a31
commit
1e8496da4a
1
.gitattributes
vendored
Normal file
1
.gitattributes
vendored
Normal file
@ -0,0 +1 @@
|
||||
.travis.yml merge=ours
|
Loading…
Reference in New Issue
Block a user