Viewing all changes in revision 484.
- Committer: l10n daemon script
- Date: 2021-01-12 05:52:51 UTC
- Revision ID: git-v1:a71489694ec56af2541a83681a99bf13c06dab27
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:
- kuiviewer/kuiviewer_part.desktop.in
expand all
collapse all
added
removed
