| commit | 414b3896321f8d011e93c7faf1dcc7b8fac1bb26 | |
| author | l10n daemon script <scripty@kde.org> | |
| Mon, 6 Feb 2017 05:00:10 +0000 (6 06:00 +0100) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Mon, 6 Feb 2017 05:00:10 +0000 (6 06:00 +0100) | ||
| tree | b493cab91a8987e8ac13fece552285b2884132d3 | treesnapshot (tar.gz zip) |
| parent | 98e5dafb46ef0e5a771852f64d959631b788cb2c | 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 |