Viewing all changes in revision 2669.
- Committer: l10n daemon script
- Date: 2020-06-17 12:16:33 UTC
- Revision ID: git-v1:706abd84278ce6398d882452901fbe9792604b0e
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:
- src/org.kde.muon.desktop
expand all
collapse all
added
removed
