diff options
| author | l10n daemon script <[email protected]> | 2025-05-24 01:34:17 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-05-24 01:34:17 +0000 |
| commit | 281fd66f914e36d93f4e698c243c3bd73bbe48e2 (patch) | |
| tree | f7f2de3133a096833a4470fd1e5b2aaa60863840 /src/dolphintabbar.cpp | |
| parent | 5f660640c400eef8e6f0e20a0563911fc7f991b5 (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/dolphintabbar.cpp')
0 files changed, 0 insertions, 0 deletions