Viewing all changes in revision 343.
- Committer: l10n daemon script
- Date: 2018-10-10 04:56:32 UTC
- Revision ID: git-v1:2959f77c8c55f5ff6da1a56baa50841a493f4f8d
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
