diff options
| author | l10n daemon script <[email protected]> | 2025-05-26 01:33:43 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-05-26 01:33:43 +0000 |
| commit | b0a9907b9cb18e7c1a566f67a90206f067b7eb5e (patch) | |
| tree | dc7cfb14f3d7f4033365c34911608a007a66ea42 /src/dolphinnewfilemenu.cpp | |
| parent | 6b17e856d2bfe875731386517083958c2d6f02e8 (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/dolphinnewfilemenu.cpp')
0 files changed, 0 insertions, 0 deletions