Viewing all changes in revision 1222.
- Committer: l10n daemon script
- Date: 2019-04-08 03:48:46 UTC
- Revision ID: git-v1:18d65ef22422242cd1a8edcae69660a6ca88d471
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:
- utils/plasma-runner-installer/plasma-runner-installer.desktop
expand all
collapse all
added
removed
