Resolve merge conflicts

This commit is contained in:
Balázs Szücs
2025-06-30 19:30:18 +02:00
parent 49697a08d8
commit a23d1f5954
2 changed files with 3 additions and 1 deletions

View File

@ -162,6 +162,8 @@
/po/de_DE.UTF-8.po @ghostty-org/de_DE
/po/es_BO.UTF-8.po @ghostty-org/es_BO
/po/fr_FR.UTF-8.po @ghostty-org/fr_FR
/po/ga_IE.UTF-8.po @ghostty-org/ga_IE
/po/hu_HU.UTF-8.po @ghostty-org/hu_HU
/po/id_ID.UTF-8.po @ghostty-org/id_ID
/po/ja_JP.UTF-8.po @ghostty-org/ja_JP
/po/mk_MK.UTF-8.po @ghostty-org/mk_MK
@ -173,7 +175,6 @@
/po/tr_TR.UTF-8.po @ghostty-org/tr_TR
/po/uk_UA.UTF-8.po @ghostty-org/uk_UA
/po/zh_CN.UTF-8.po @ghostty-org/zh_CN
/po/hu_HU.UTF-8.po @ghostty-org/hu_HU
# Packaging - Snap
/snap/ @ghostty-org/snap

View File

@ -45,6 +45,7 @@ pub const locales = [_][:0]const u8{
"es_BO.UTF-8",
"pt_BR.UTF-8",
"ca_ES.UTF-8",
"ga_IE.UTF-8",
"hu_HU.UTF-8",
};