| commit | 78fe5256f222c0180d6c05aedafd7152f1d902d0 | |
| author | l10n daemon script <scripty@kde.org> | |
| Fri, 12 May 2017 02:19:42 +0000 (12 04:19 +0200) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Fri, 12 May 2017 02:19:42 +0000 (12 04:19 +0200) | ||
| tree | 6d772d2eede7073d8d6bbdd6ef19828ca5b7eb2a | treesnapshot (tar.gz zip) |
| parent | 83866ff63f41da89cba78bb720231f0f1ded6b56 | 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 |