| commit | 76151f1a9226b27da9039d8701dc91a9f5e7c056 | |
| author | l10n daemon script <scripty@kde.org> | |
| Wed, 10 Oct 2018 04:20:12 +0000 (10 06:20 +0200) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Wed, 10 Oct 2018 04:20:12 +0000 (10 06:20 +0200) | ||
| tree | 05088adb5d6073ff846357f6a1c7e28901c46b5c | treesnapshot (tar.gz zip) |
| parent | ca34db59118357eb5f7fce8655d2105dcc50186b | 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 |