Viewing all changes in revision 644.
- Committer: l10n daemon script
- Date: 2019-07-08 02:59:17 UTC
- Revision ID: git-v1:1dcb984bc4a5c934b9619e5a219d07e0f7a7497b
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
