Viewing all changes in revision 486.
- Committer: l10n daemon script
- Date: 2021-01-21 06:06:15 UTC
- Revision ID: git-v1:1710cfd3310acf7244b262a951689c5574c58575
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:
- kuiviewer/kuiviewer_part.desktop.in
expand all
collapse all
added
removed
