1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +01:00
falkonOfficial/themes
l10n daemon script 680b07008a 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-03-30 05:23:04 +02:00
..
chrome SVN_SILENT made messages (.desktop file) - always resolve ours 2018-03-30 05:23:04 +02:00
linux SVN_SILENT made messages (.desktop file) - always resolve ours 2018-03-30 05:23:04 +02:00
mac SVN_SILENT made messages (.desktop file) - always resolve ours 2018-03-30 05:23:04 +02:00
windows SVN_SILENT made messages (.desktop file) - always resolve ours 2018-03-30 05:23:04 +02:00