Viewing all changes in revision 807.
- Committer: l10n daemon script
- Date: 2019-10-14 03:03:27 UTC
- Revision ID: git-v1:1fce659cdbbac5ce7fc7974bdb91c5df11e253b8
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.klettres.desktop
expand all
collapse all
added
removed
