Viewing all changes in revision 12192.
- Committer: l10n daemon script
- Date: 2020-05-09 04:40:05 UTC
- Revision ID: git-v1:ae8cbd5c25a48e2ac7bd0f651855327ebd374c28
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/plasma/wallpapers/worldmap/metadata.desktop
expand all
collapse all
added
removed
