Viewing all changes in revision 686.
- Committer: l10n daemon script
- Date: 2021-03-27 04:57:02 UTC
- Revision ID: git-v1:b0acb58f84c35ff597f6290c69adc07885eb5510
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/part/kgraphviewer_part.desktop.in
expand all
collapse all
added
removed
