Viewing all changes in revision 517.
- Committer: l10n daemon script
- Date: 2019-06-25 03:15:34 UTC
- Revision ID: git-v1:4adc9c9e3b0f199d55b97298f4cd0875f1a5c6ed
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:
- solid_camera.desktop
expand all
collapse all
added
removed
