| commit | a0dcf1f4b85ed7e6127e9cd8b1e0f59c8ee8812e | |
| author | l10n daemon script <scripty@kde.org> | |
| Tue, 16 May 2017 02:18:59 +0000 (16 04:18 +0200) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Tue, 16 May 2017 02:18:59 +0000 (16 04:18 +0200) | ||
| tree | c964f03133ab6e7dbfa934bc049a0818d44f882a | treesnapshot (tar.gz zip) |
| parent | 16d5debef04080bc36e9b7bbf35eba330a5197a4 | 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 |