mirror of
https://salsa.debian.org/debian/debian-reference.git
synced 2026-01-11 20:07:28 +00:00
disable buggy merge driver
Signed-off-by: Osamu Aoki <osamu@debian.org>
This commit is contained in:
parent
62c4f7da88
commit
c411e9265d
1 changed files with 2 additions and 2 deletions
4
.gitattributes
vendored
4
.gitattributes
vendored
|
|
@ -1,2 +1,2 @@
|
|||
po/*.po merge=merge-po-files
|
||||
po/debian-reference.pot merge=merge-po-files
|
||||
#po/*.po merge=merge-po-files
|
||||
#po/debian-reference.pot merge=merge-po-files
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue