Viewing all changes in revision 633.
- Committer: l10n daemon script
- Date: 2017-12-20 06:04:12 UTC
- Revision ID: git-v1:0298bf3789d74e3693ddb475c80b1a71c77d2822
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:
- src/kcm_cron.desktop
expand all
collapse all
added
removed
