diff options
| author | l10n daemon script <[email protected]> | 2025-08-27 01:36:52 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-08-27 01:36:52 +0000 |
| commit | 391c55f0a86a151b9f45d7a65f92db713bcc7013 (patch) | |
| tree | 75cb089d9450aa892699f00c72a8a8a741448df6 /src/dolphinpart.cpp | |
| parent | b498e2e43c00d718474d973fb98e6c7d94e32d0a (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