| commit | c70d88742462745d337767ac2545bbbd5665a925 | |
| author | l10n daemon script <scripty@kde.org> | |
| Mon, 6 Jan 2020 04:52:22 +0000 (6 05:52 +0100) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Mon, 6 Jan 2020 04:52:22 +0000 (6 05:52 +0100) | ||
| tree | 2ad0f01ad550d4d060156f53b82db54f3f2021c6 | treesnapshot (tar.gz zip) |
| parent | a86db1a983482ae57e1795a43ef39867c3fb8409 | 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 |