1
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 09:32:12 +01:00
falkonOfficial/linux/applications
l10n daemon script 7faf9e2e8d 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"
2017-12-21 04:50:47 +01:00
..
org.kde.Falkon.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2017-12-21 04:50:47 +01:00