Viewing all changes in revision 624.
- Committer: l10n daemon script
- Date: 2018-02-08 04:10:56 UTC
- Revision ID: git-v1:5463eef1b4ac6a9c5fd051ee6a8efda56b1aaa60
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.kbounce.desktop
expand all
collapse all
added
removed
