diff options
| author | l10n daemon script <[email protected]> | 2025-09-17 01:36:00 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-09-17 01:36:00 +0000 |
| commit | 7be1e4aa5f1dd257ac1ad9f811e2e7665d8751a4 (patch) | |
| tree | a90abb6f598463438339eff6d49193edbafdb940 /src/dolphinpart.cpp | |
| parent | 7b52f81fe1c34ddfe7d5916cba0b24383428f12e (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/dolphinpart.cpp')
0 files changed, 0 insertions, 0 deletions