Viewing all changes in revision 608.
- Committer: l10n daemon script
- Date: 2019-05-31 03:07:30 UTC
- Revision ID: git-v1:fff060701cacf1ecdb38db5162964d91e8cc2961
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
