Viewing all changes in revision 686.
- Committer: l10n daemon script
- Date: 2022-06-13 02:11:21 UTC
- Revision ID: git-v1:b6eb782bb7e47a0beceaf5f7aa98e4d260f67c65
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:
- org.kde.kmouth.desktop
expand all
collapse all
added
removed
