| commit | 847cff8bf857e10b0bfbbe1c12b6e90293cf69a9 | |
| author | l10n daemon script <scripty@kde.org> | |
| Mon, 25 Jul 2016 03:24:22 +0000 (25 03:24 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Mon, 25 Jul 2016 03:24:22 +0000 (25 03:24 +0000) | ||
| tree | 87e71728d9be71874d69ba72fb09064fecf236ee | treesnapshot (tar.gz zip) |
| parent | 14e424a3ca51d1d0e965fbc6863838636c92bee4 | 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/trojita.desktop | diffblobblamehistory |