Viewing all changes in revision 3131.
- Committer: l10n daemon script
- Date: 2019-11-19 04:25:17 UTC
- Revision ID: git-v1:9aa8ad4f71ca276ea2cd81df9b11323516b3fdda
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:
- dataengines/apps/plasma-dataengine-org.kde.active.apps.desktop
expand all
collapse all
added
removed
