Viewing all changes in revision 1178.
- Committer: l10n daemon script
- Date: 2019-05-22 03:21:42 UTC
- Revision ID: git-v1:1f4dad79eec8e8569fa1399bd9480ac127d54e08
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/kipiplugin.desktop
expand all
collapse all
added
removed
