diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2019-01-12 10:10:17 +0100 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2019-01-12 10:10:17 +0100 |
| commit | 564a0d1e03cd4bb9dae7ca788d8c5d05a2de9b84 (patch) | |
| tree | 08386ef56783312240d31f646fa2aa80b8174f75 /.gitattributes | |
| parent | 810a29e9f56f8d3cf2cb1b66118b84d092be06b8 (diff) | |
Exclude both .po and .wxl files from local Git merges across branches
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index db2d848cb1..0076522bf9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -23,3 +23,4 @@ # Exclude WiX translations from merging /build/wix/Localization/po/*.po merge=ours +/build/wix/Localization/po/*.wxl merge=ours |