diff options
| author | l10n daemon script <[email protected]> | 2026-02-26 01:41:19 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-02-26 01:41:19 +0000 |
| commit | a4fbadd0db961694cb57f75a8752e538cfe3f263 (patch) | |
| tree | 7f59997e17ac1ed923b69030dcf5aca1582d1e35 /src/dolphinviewcontainer.h | |
| parent | 819b00871e126c11b2a40d1f3cc341640774255c (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/dolphinviewcontainer.h')
0 files changed, 0 insertions, 0 deletions