diff options
| author | l10n daemon script <[email protected]> | 2022-04-01 02:03:03 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-04-01 02:03:03 +0000 |
| commit | 356ccd21b4d386511ffed5f10fd612b5c82c876c (patch) | |
| tree | 86273d684f6b42d9907309fda17a8eb6f0ccf6ff /src/settings | |
| parent | 3ccc0420a694deeb0d236c7b39ce569bd074f3e8 (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