Viewing all changes in revision 1054.
- Committer: l10n daemon script
- Date: 2021-09-06 01:28:35 UTC
- Revision ID: git-v1:7c0c2ba367f5fa8603fd363edbc79422fe41c326
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/app/org.kde.kompare.desktop
expand all
collapse all
added
removed
