Viewing all changes in revision 514.
- Committer: l10n daemon script
- Date: 2019-05-11 03:58:16 UTC
- Revision ID: git-v1:edd4263647b1279cc5db8a0de1582b35d1b3a65a
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
