1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
falkonOfficial/linux/applications
l10n daemon script b6dabb55aa 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-08-27 04:43:13 +02:00
..
org.kde.Falkon.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2017-08-27 04:43:13 +02:00