| commit | c500ff7a13b43e43c2781cf135f2f04a21893f86 | |
| author | l10n daemon script <scripty@kde.org> | |
| Tue, 31 May 2016 11:05:31 +0000 (31 11:05 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Tue, 31 May 2016 11:05:31 +0000 (31 11:05 +0000) | ||
| tree | a0f239c79e5cae175ab73a643b0f127cb9bca3af | treesnapshot (tar.gz zip) |
| parent | 10e7b8f2c428693bb892f68ee5c8e69f54273070 | 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 |