diff options
| author | l10n daemon script <[email protected]> | 2021-12-05 01:44:08 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2021-12-05 01:44:08 +0000 |
| commit | 6cd5e10f22b584629f62b9b7c1034d57802b7572 (patch) | |
| tree | 1a1b1d1f856c5c40abf4c0a6c5873411e7048308 /src/tests/kfileitemmodeltest.cpp | |
| parent | 45bf40d422246c11d649e5d67a8f1ad5d22f7b11 (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/tests/kfileitemmodeltest.cpp')
0 files changed, 0 insertions, 0 deletions