Viewing all changes in revision 729.
- Committer: l10n daemon script
- Date: 2020-06-18 03:28:40 UTC
- Revision ID: git-v1:01d2cfc2fe04f7e0f4cf1d2e8b77ac0225b6c844
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/org.kde.kbruch.desktop
expand all
collapse all
added
removed
