1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-24 04:36:34 +01:00
falkonOfficial/themes
l10n daemon script 2a25618bed 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"
2023-01-14 02:01:20 +00:00
..
chrome SVN_SILENT made messages (.desktop file) - always resolve ours 2023-01-14 02:01:20 +00:00
linux SVN_SILENT made messages (.desktop file) - always resolve ours 2022-09-06 01:45:36 +00:00
mac SVN_SILENT made messages (.desktop file) - always resolve ours 2022-09-06 01:45:36 +00:00
windows SVN_SILENT made messages (.desktop file) - always resolve ours 2023-01-14 02:01:20 +00:00