diff options
| author | l10n daemon script <[email protected]> | 2025-07-18 01:33:39 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-07-18 01:33:39 +0000 |
| commit | d955a72c0ccbae65a629d5f86db4fdb305ccfef4 (patch) | |
| tree | 1518ee47603d66b6d6f5152a0b72740d8dc39722 /src/dolphinmainwindow.cpp | |
| parent | e36976633ca9c6fa60255174b1f4035c092ef309 (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