diff options
| author | l10n daemon script <[email protected]> | 2022-04-05 01:51:00 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-04-05 01:51:00 +0000 |
| commit | 989d19c126abc35f5c6df2a1117334f1468e48e8 (patch) | |
| tree | a0737bdf5143b81fddc27e1739adb687fcc3962c /src/settings | |
| parent | 86df5ae994e96483559020befd96b838aee4d3ee (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