diff options
| author | l10n daemon script <[email protected]> | 2026-04-10 02:00:54 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-04-10 02:00:54 +0000 |
| commit | 40a39559d11fce6faf5c9f2b1e4323dad077b97c (patch) | |
| tree | 8dd68e9c33aad59600f9f473895c78025b828923 /src/panels/folders/foldersitemlistwidget.cpp | |
| parent | da9ca9c6cef71cf63c3d5103dc60ddab7e584e57 (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/panels/folders/foldersitemlistwidget.cpp')
0 files changed, 0 insertions, 0 deletions