diff options
| author | l10n daemon script <[email protected]> | 2022-06-07 02:25:10 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-06-07 02:25:10 +0000 |
| commit | e406bc197fc0116d7fd8bb62086b41c52417c948 (patch) | |
| tree | d4fc3528974379f8c6b6837b1fbadf4c7d8025cc /src/kitemviews | |
| parent | ee76ae866ecebe22667ac8227853ca711be5c2c7 (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