Viewing all changes in revision 625.
- Committer: l10n daemon script
- Date: 2018-05-02 03:29:51 UTC
- Revision ID: git-v1:05143a07f0eb074c10384d9a918f785651746f73
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
