diff options
| author | l10n daemon script <[email protected]> | 2024-08-28 01:32:24 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-08-28 01:32:24 +0000 |
| commit | 6b1a5a2779f404165fd1e0b117fdac6dbdf75cc5 (patch) | |
| tree | 387b08a9a802cd34a58d248004c52b54a5c9b499 /src/kitemviews/private | |
| parent | 5797371c789f8814b2310b2ee659724d10a413c2 (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/private')
0 files changed, 0 insertions, 0 deletions