Viewing all changes in revision 176.
- Committer: l10n daemon script
- Date: 2017-07-29 00:06:22 UTC
- Revision ID: git-v1:c114aa81ea76641498c0d857e6cb12b210eca2f2
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:
- helper/polkitkde1.actions
expand all
collapse all
added
removed
