diff options
| author | l10n daemon script <[email protected]> | 2022-04-27 01:46:00 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-04-27 01:46:00 +0000 |
| commit | 8076b54a2ce8c1253385c9ee3f24938bdbf4773c (patch) | |
| tree | c47ef3ac02b0930e408540a2f729989902f044af /src/dolphinpart_ext.cpp | |
| parent | 57c0c2db7e3d76d37b4fd6efc43bb3cd987949e7 (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_ext.cpp')
0 files changed, 0 insertions, 0 deletions