« back to all changes in this revision
Viewing changes to kanjibrowser/org.kde.kitenkanjibrowser.desktop
- Committer: l10n daemon script
- Date: 2019-01-06 04:33:08 UTC
- Revision ID: git-v1:7f7b75a1b22e0b3b98e2b4cb22561e5859aff5ab
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:
- kanjibrowser/org.kde.kitenkanjibrowser.desktop
added
removed
kanjibrowser/org.kde.kitenkanjibrowser.desktop
