diff options
| author | l10n daemon script <[email protected]> | 2026-03-22 01:39:35 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-03-22 01:39:35 +0000 |
| commit | b9530db1b070086b6539f1f1892aeac4d503c2ae (patch) | |
| tree | 436cd4abf0c86e5fd45be4dbe94021563aee3dc8 /src/itemactions/setfoldericonitemaction.h | |
| parent | dfef28748e4e9af8aefd969e24689e68698b74a3 (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/itemactions/setfoldericonitemaction.h')
0 files changed, 0 insertions, 0 deletions