diff options
| author | l10n daemon script <[email protected]> | 2024-06-12 01:20:11 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-06-12 01:20:11 +0000 |
| commit | 02422bca8986769746001658e1b7d10940ae2b8d (patch) | |
| tree | ef44ff197f22e92dbb0b48b19d14b6791b2bfac7 /src/dolphincontextmenu.cpp | |
| parent | bee17990d04f8db77d31946ee6c756e9755a9f52 (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/dolphincontextmenu.cpp')
0 files changed, 0 insertions, 0 deletions