Viewing all changes in revision 888.
- Committer: l10n daemon script
- Date: 2020-02-23 04:38:06 UTC
- Revision ID: git-v1:8ee8ba0c67cbf4c56a2b5e8e0b06e6425e4845ad
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.artikulate.desktop
expand all
collapse all
added
removed
