Viewing all changes in revision 553.
- Committer: l10n daemon script
- Date: 2019-05-26 03:23:07 UTC
- Revision ID: git-v1:48f2483d3e3526daceedd1850d07e753cc7a8f13
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
