Commit graph

2 commits

Author SHA1 Message Date
l10n daemon script
60b1f83b48 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"
2020-05-15 06:13:41 +02:00
Nicolas Fella
ffb0f3db9f Combine handler desktop files 2020-05-14 19:49:08 +00:00
Renamed from urlhandler/org.kde.kdeconnect.telhandler.desktop (Browse further)