| commit | bab4e465e23f4fef2354af09582dfea48f3d1bbe | |
| author | l10n daemon script <scripty@kde.org> | |
| Sun, 2 Oct 2016 02:58:20 +0000 (2 02:58 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Sun, 2 Oct 2016 02:58:20 +0000 (2 02:58 +0000) | ||
| tree | 0181b59c6acdf437011c2018c2e172924b665e59 | treesnapshot (tar.gz zip) |
| parent | 6420dceeb85b08b58ff0f8c291ac82ea7d180e61 | 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 |