diff options
| author | l10n daemon script <[email protected]> | 2024-08-27 01:22:38 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-08-27 01:22:38 +0000 |
| commit | 2dc848d7d1166bfa6c1ae7d9970f6ad7f924d49b (patch) | |
| tree | 5f585497892ccaf65941505cc78d88dbf17659b4 /src/dolphinnavigatorswidgetaction.cpp | |
| parent | 11f27e98df4084df24f6beae74b5018de6c94878 (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/dolphinnavigatorswidgetaction.cpp')
0 files changed, 0 insertions, 0 deletions