Viewing all changes in revision 4897.
- Committer: l10n daemon script
- Date: 2020-02-13 04:42:03 UTC
- Revision ID: git-v1:0633a80d02e05c0b13bc02c8a6697c92e9d7d751
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
