diff options
| author | l10n daemon script <[email protected]> | 2022-01-02 02:03:50 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-01-02 02:03:50 +0000 |
| commit | f386f848dee5b895e859857af68dd5b170e639e1 (patch) | |
| tree | bc20d2a1c7ccc599ed075e75f33a17be1349e8a3 /src/settings | |
| parent | 28ecfd5a34eebefa9944840bbf83b4911f59c004 (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