| commit | 5cc4e5e0c8a32239f5182d71628be09f19a5bd31 | |
| author | l10n daemon script <scripty@kde.org> | |
| Thu, 18 Jun 2020 03:43:56 +0000 (18 05:43 +0200) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Thu, 18 Jun 2020 03:43:56 +0000 (18 05:43 +0200) | ||
| tree | bddad14bcabe38e4fbe7ca61c7d28e98c99b2085 | treesnapshot (tar.gz zip) |
| parent | bdf8283399f1c1950b86852a4f82f44124a4a6f4 | 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 |