diff options
| author | l10n daemon script <[email protected]> | 2025-07-26 01:34:12 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-07-26 01:34:12 +0000 |
| commit | b7d174d33e556d95f6630aee521e5d726cd20a73 (patch) | |
| tree | 2b3ddba5985ac9bddbd1818ce8bcffb4c6c1e990 /src/dolphinmainwindow.cpp | |
| parent | fbba4c4d855a7ebc949be2f32ee30cad0204bba0 (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/dolphinmainwindow.cpp')
0 files changed, 0 insertions, 0 deletions