Viewing all changes in revision 614.
- Committer: l10n daemon script
- Date: 2019-10-31 04:33:59 UTC
- Revision ID: git-v1:0d1538011333de10bebd5e0b17cc3d82ce6bf3c5
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:
- kcm/kcm_kscreen.desktop
expand all
collapse all
added
removed
