diff options
| author | l10n daemon script <[email protected]> | 2025-10-01 01:40:20 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-10-01 01:40:20 +0000 |
| commit | bf3c9f90bbbeb164841d772a22067afffd70ed3b (patch) | |
| tree | ce77eec4d4225378536e24389b2e87b9cb5b2247 /src/dolphintabpage.cpp | |
| parent | 982943fd1c05b3c6a1d640acb00abd206a662869 (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/dolphintabpage.cpp')
0 files changed, 0 insertions, 0 deletions