Viewing all changes in revision 580.
- Committer: l10n daemon script
- Date: 2019-11-20 04:45:29 UTC
- Revision ID: git-v1:5289bfb509a885fc1eee231249c576df04804e7d
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:
- kde-gtk-config.desktop
expand all
collapse all
added
removed
