Viewing all changes in revision 491.
- Committer: l10n daemon script
- Date: 2018-08-05 03:31:35 UTC
- Revision ID: git-v1:a3af4070996a1db5c9174d4bde4bf68a9f94f986
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:
- kcontrol/kamera.desktop
expand all
collapse all
added
removed
