Viewing all changes in revision 389.
- Committer: l10n daemon script
- Date: 2020-08-24 04:02:21 UTC
- Revision ID: git-v1:a8d48287bafa79ee54377a82d21a7670d5c82add
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:
- policykit1-kde.notifyrc
expand all
collapse all
added
removed
