Viewing all changes in revision 595.
- Committer: l10n daemon script
- Date: 2020-05-10 04:05:04 UTC
- Revision ID: git-v1:5384350823108c412028dedb027a5e14d4f4a3b4
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:
- data/org.kde.yakuake.desktop
expand all
collapse all
added
removed
