Viewing all changes in revision 500.
- Committer: l10n daemon script
- Date: 2021-05-17 01:37:57 UTC
- Revision ID: git-v1:05ffaa6281922deee413a14f8cf1f9aa28154878
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
