| commit | 21721a2c3912b141b78d76c4f068a0917670a2e3 | |
| author | l10n daemon script <scripty@kde.org> | |
| Wed, 17 Jun 2020 12:11:27 +0000 (17 14:11 +0200) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Wed, 17 Jun 2020 12:11:27 +0000 (17 14:11 +0200) | ||
| tree | 9d276bd6bbaf8857a518c9323d1508faabd3c12f | treesnapshot (tar.gz zip) |
| parent | 8085c1b2bbc86d6dc8c4bbaa4fec55a49a046fa0 | 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 |