Viewing all changes in revision 678.
- Committer: l10n daemon script
- Date: 2021-01-12 05:39:32 UTC
- Revision ID: git-v1:5a90c070240d2080b3a12743b09281ef3e105bd3
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
