diff options
| author | l10n daemon script <[email protected]> | 2024-06-17 01:19:40 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-06-17 01:19:40 +0000 |
| commit | ba8026df8259ac4570129018096e835ec5071724 (patch) | |
| tree | e4c7199d4983648745aea8487b7f609f8818739d /src/settings | |
| parent | e843589057c71e7ba3a626194cb169d5cf241951 (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/settings')
0 files changed, 0 insertions, 0 deletions