diff options
| author | l10n daemon script <[email protected]> | 2024-05-27 01:17:13 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-05-27 01:17:13 +0000 |
| commit | c0b6048af48f66aec30197f852e0a862192744bc (patch) | |
| tree | 907b70b81097dd4a54c33084dd07e3ce8f89e018 /src/dolphinremoveaction.cpp | |
| parent | ae8ca31f428525a8e3b002cc9e3b3a99df76c5c7 (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/dolphinremoveaction.cpp')
0 files changed, 0 insertions, 0 deletions