diff options
| author | l10n daemon script <[email protected]> | 2022-05-22 01:44:35 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-05-22 01:44:35 +0000 |
| commit | 30b62a1c042c150daa5700bbd86bb14df80b7744 (patch) | |
| tree | 127fc64873850ef2dce86b785c48c3111c9dba68 /src/dolphinpart.cpp | |
| parent | 85083b209c5ac58be5e4b0a35dee54a5085a074c (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