Viewing all changes in revision 683.
- Committer: l10n daemon script
- Date: 2021-02-10 07:11:36 UTC
- Revision ID: git-v1:b52f766b21d842c69838bf71616c8e828b2c6abf
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
