1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +01:00
falkonOfficial/linux/applications
l10n daemon script 7b0d1abdc9 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-01-25 05:05:01 +01:00
..
org.kde.falkon.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2018-01-25 05:05:01 +01:00