Viewing all changes in revision 415.
- Committer: l10n daemon script
- Date: 2018-07-16 03:21:43 UTC
- Revision ID: git-v1:a674de2023299c89a222885c4073f46c88c4ddc7
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/org.kde.kuiviewer.desktop
expand all
collapse all
added
removed
