Viewing all changes in revision 4895.
- Committer: l10n daemon script
- Date: 2020-02-09 04:39:42 UTC
- Revision ID: git-v1:89eed1594d64428df81bc28d2b4de435a1091ecd
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
