disable buggy merge driver

Signed-off-by: Osamu Aoki <osamu@debian.org>
This commit is contained in:
Osamu Aoki 2024-02-27 15:04:15 +09:00
parent 62c4f7da88
commit c411e9265d

4
.gitattributes vendored
View file

@ -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