diff options
| author | l10n daemon script <[email protected]> | 2022-04-26 01:43:17 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-04-26 01:43:17 +0000 |
| commit | c88ce580e6ad720342e7efec2c7e24d8362b648c (patch) | |
| tree | a57c2bbbc42f5009fb511860e037b0ae85a90e17 /src/kitemviews | |
| parent | 7153234e462fcb100093dedb490f55a8088cf4d7 (diff) | |
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"
Diffstat (limited to 'src/kitemviews')
0 files changed, 0 insertions, 0 deletions