Viewing all changes in revision 684.
- Committer: l10n daemon script
- Date: 2021-02-15 06:03:58 UTC
- Revision ID: git-v1:2a6ad09fcaf516d0b94d2dcf6b183243f0ebc3ef
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
