| commit | bea4a1d5af8cc5dd77e4524a171dba235231d6c6 | |
| author | l10n daemon script <scripty@kde.org> | |
| Sun, 31 Dec 2017 03:48:29 +0000 (31 04:48 +0100) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Sun, 31 Dec 2017 03:48:29 +0000 (31 04:48 +0100) | ||
| tree | fb7a372e4777edde7ffd348a7404af201f5ce3b4 | treesnapshot (tar.gz zip) |
| parent | c96b8c45d2a97ca8331a7b8ef6b5484f64167489 | 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 |