| commit | 1868ad3e77667a232227f2a368f6fb6500e42972 | |
| author | l10n daemon script <scripty@kde.org> | |
| Sat, 16 Apr 2016 09:58:27 +0000 (16 09:58 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Sat, 16 Apr 2016 09:58:27 +0000 (16 09:58 +0000) | ||
| tree | 527c3f369dcd2018e7c5f7cb1949afd2a74df67e | treesnapshot (tar.gz zip) |
| parent | 90c3db55fd199c9d7a640393d731fb15a73844f3 | 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"
| akregator/configuration/akregator_config_webengineurlinterceptor.desktop | diffblobblamehistory |