Viewing all changes in revision 575.
- Committer: l10n daemon script
- Date: 2018-09-03 03:48:58 UTC
- Revision ID: git-v1:64c288a155996f730b7a8e86d860edbb7f62c877
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.kbreakout.desktop
expand all
collapse all
added
removed
