diff options
| author | Be <be@mixxx.org> | 2020-05-07 09:56:22 -0500 |
|---|---|---|
| committer | Be <be@mixxx.org> | 2020-05-07 09:56:22 -0500 |
| commit | 00feedc9c72e1a0bb925355425f2de6596d39fc9 (patch) | |
| tree | 5f9c4a536c24c9d9b271737b9b3a7c9ba7af13b4 /.gitattributes | |
| parent | 3970b4e3e940bbf656e9770d67a26aa2c16151cc (diff) | |
| parent | 898052f480ddbdefe3a36ce73893b90731f3beb3 (diff) | |
Merge remote-tracking branch 'upstream/master' into migrate-to-QJSEngine
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 0076522bf9..ae4a396de8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -24,3 +24,6 @@ # Exclude WiX translations from merging /build/wix/Localization/po/*.po merge=ours /build/wix/Localization/po/*.wxl merge=ours + +# Treat serato test data as binary +*.octet-stream binary |