diff options
| author | l10n daemon script <[email protected]> | 2022-04-07 02:58:35 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-04-07 02:58:35 +0000 |
| commit | e50ff16e6871f6322cad23d8eb907b2f892c9289 (patch) | |
| tree | 929ab3877efa982cb20c9a82ab18f3685b0e1f83 /src/dolphinbookmarkhandler.cpp | |
| parent | 2a3b731ca2b13c518c92951e2d1efa9a53dd70b3 (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/dolphinbookmarkhandler.cpp')
0 files changed, 0 insertions, 0 deletions