diff options
| author | l10n daemon script <[email protected]> | 2026-02-25 01:43:55 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-02-25 01:43:55 +0000 |
| commit | c8f6833bbab22da2d1ad73c74437dffcda277593 (patch) | |
| tree | d999c543f882ff5f87c2efe749c2ee27631ade55 /src/dolphinui.rc | |
| parent | 93b20c94ddd2c190dcfa0fa5b2c3c4f953e699bd (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/dolphinui.rc')
0 files changed, 0 insertions, 0 deletions