Viewing all changes in revision 4892.
- Committer: l10n daemon script
- Date: 2019-11-20 04:31:54 UTC
- Revision ID: git-v1:8e5a024cfd9caa9df2e846d278b64c8f64c701d0
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/Gui/org.kde.trojita.desktop
expand all
collapse all
added
removed
