1
mirror of https://invent.kde.org/network/falkon.git synced 2025-09-10 00:27:55 +02:00
falkonOfficial/themes
l10n daemon script 2a64bc8486 SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
2025-09-08 01:50:20 +00:00
..
chrome SVN_SILENT made messages (.desktop file) - always resolve ours 2025-09-08 01:50:20 +00:00
linux SVN_SILENT made messages (.desktop file) - always resolve ours 2025-09-08 01:50:20 +00:00
mac SVN_SILENT made messages (.desktop file) - always resolve ours 2025-09-08 01:50:20 +00:00
windows SVN_SILENT made messages (.desktop file) - always resolve ours 2025-09-08 01:50:20 +00:00