Exclude both .po and .wxl files from local Git merges across branches · mixxxdj/mixxx@564a0d1 · GitHub

Commit

Exclude both .po and .wxl files from local Git merges across branches

Browse files

Loading branch information

uklotzde committed Jan 12, 2019

1 parent 810a29e commit 564a0d1

.gitattributes

Original file line number	Diff line number	Diff line change
Expand Up		@@ -23,3 +23,4 @@

		# Exclude WiX translations from merging
		/build/wix/Localization/po/*.po merge=ours
		/build/wix/Localization/po/*.wxl merge=ours

0 comments on commit `564a0d1`

Please sign in to comment.