1
mirror of https://invent.kde.org/network/falkon.git synced 2024-09-21 17:52:10 +02:00
falkonOfficial/themes
l10n daemon script 0c30443e84 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"
2018-06-06 05:35:48 +02:00
..
chrome SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-06 05:35:48 +02:00
linux SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-06 05:35:48 +02:00
mac SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-06 05:35:48 +02:00
windows SVN_SILENT made messages (.desktop file) - always resolve ours 2018-06-06 05:35:48 +02:00