diff options
| author | l10n daemon script <[email protected]> | 2026-01-16 01:39:59 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-01-16 01:39:59 +0000 |
| commit | c4f8f736e480b81822c9e816167ff51e9d04131b (patch) | |
| tree | 92f43eedf0f97d2ef0cc53bee54dc8463f9a48e4 /src/itemactions/hidefileitemaction.json | |
| parent | ba425b67d2883bd890fe303f74378324a08f9a32 (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/hidefileitemaction.json')
0 files changed, 0 insertions, 0 deletions