Viewing all changes in revision 205.
- Committer: l10n daemon script
- Date: 2018-09-22 04:05:30 UTC
- Revision ID: git-v1:b694f0061b2d119fc3dfdc7d21ed7057c0f1da89
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:
- src/org.kde.kubrick.desktop
expand all
collapse all
added
removed
