| commit | d8549e32930ef1f434607cc6994274a2701e6d17 | |
| author | l10n daemon script <scripty@kde.org> | |
| Fri, 2 Sep 2016 03:07:16 +0000 (2 03:07 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Fri, 2 Sep 2016 03:07:16 +0000 (2 03:07 +0000) | ||
| tree | 471ef1d2cb9951288dca9637cedd398a294e97f1 | treesnapshot (tar.gz zip) |
| parent | b1ee7f1c4be94a1d5b3f4cec479ae97c5479f4be | 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 |