diff options
| author | l10n daemon script <[email protected]> | 2023-02-12 02:02:18 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2023-02-12 02:02:18 +0000 |
| commit | d185e218871f7fb8016291994564bf266dd5df70 (patch) | |
| tree | 49ffdd0e941e5d07b1def7dd1d6a09fe436bad84 /src/kitemviews | |
| parent | f885d2f1be6c52be33008f4afe95291d82c3618f (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