| commit | 0633a80d02e05c0b13bc02c8a6697c92e9d7d751 | |
| author | l10n daemon script <scripty@kde.org> | |
| Thu, 13 Feb 2020 04:42:03 +0000 (13 05:42 +0100) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Thu, 13 Feb 2020 04:42:03 +0000 (13 05:42 +0100) | ||
| tree | fae2c60f38dcb7c69836b728f193eeabd6f7659a | treesnapshot (tar.gz zip) |
| parent | 8a4ea48bd49958c6182ed047c54369fd0b4f9709 | commitdiff |
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"
| src/Gui/org.kde.trojita.desktop | diffblobblamehistory |