Viewing all changes in revision 3394.
- Committer: l10n daemon script
- Date: 2019-01-06 04:32:53 UTC
- Revision ID: git-v1:6fbf5c131049f8ce9f30d750bec900c849b79bb9
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.kalzium.desktop
expand all
collapse all
added
removed
