Viewing all changes in revision 1954.
- Committer: l10n daemon script
- Date: 2020-03-11 09:02:18 UTC
- Revision ID: git-v1:0b8fda3ab3897c7e308320438941c8be41a892b5
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"
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"
- files modified:
- fileitemactionplugin/kdeconnectsendfile.json
expand all
collapse all
added
removed
