Viewing all changes in revision 901.1.7.
- Committer: l10n daemon script
- Date: 2024-05-20 01:16:33 UTC
- mto: This revision was merged to the branch mainline in revision 903.
- Revision ID: git-v1:484158702d8f1490038794c64ae6cafa9cf86c03
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
