Viewing all changes in revision 504.
- Committer: l10n daemon script
- Date: 2018-11-06 05:01:22 UTC
- Revision ID: git-v1:eb53c5912d12d4b8c231b23aaea7ed0eb12c6abc
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
