Viewing all changes in revision 676.
- Committer: l10n daemon script
- Date: 2021-01-06 06:19:27 UTC
- Revision ID: git-v1:714077f23d424c47f0f5e18d03906e03f87a1b5d
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
