| commit | 9689974ee75487635d62966372471fc21575b480 | |
| author | l10n daemon script <scripty@kde.org> | |
| Thu, 17 May 2018 03:33:07 +0000 (17 05:33 +0200) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Thu, 17 May 2018 03:33:07 +0000 (17 05:33 +0200) | ||
| tree | 7b5b130fb93bb6e3370c4d6dc2f728994fb7dec4 | treesnapshot (tar.gz zip) |
| parent | af13d0f80a88572a00ef9ed657ebe24da42820d9 | 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 |