Viewing all changes in revision 880.
- Committer: l10n daemon script
- Date: 2019-04-03 04:07:32 UTC
- Revision ID: git-v1:b48d45989be9147d3b37377564d8917044baf2da
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:
- org.kde.ktuberling.desktop
expand all
collapse all
added
removed
