Viewing all changes in revision 506.
- Committer: l10n daemon script
- Date: 2018-11-20 04:41:00 UTC
- Revision ID: git-v1:6628e53be9f919fa166e1e9c057ea7a79e2a7a42
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
