From 564a0d1e03cd4bb9dae7ca788d8c5d05a2de9b84 Mon Sep 17 00:00:00 2001
From: Uwe Klotz <uklotz@mixxx.org>
Date: Sat, 12 Jan 2019 10:10:17 +0100
Subject: Exclude both .po and .wxl files from local Git merges across branches

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

(limited to '.gitattributes')

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
-- 
cgit v1.2.3