Viewing all changes in revision 1025.
- Committer: l10n daemon script
- Date: 2024-08-28 01:23:23 UTC
- Revision ID: git-v1:fc6d4cbb1160345ac705c45de43484df8cd1db18
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.json.in
expand all
collapse all
added
removed
