diff options
| author | l10n daemon script <[email protected]> | 2022-07-23 01:50:13 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-07-23 01:50:13 +0000 |
| commit | f0749ee42ccb2e0a7caee165b9934de8e61bfcbc (patch) | |
| tree | 504e56807cab4bca7b4c87aa2973bbd586ce2153 /AUTHORS | |
| parent | d0c3e373a131f9e9d1dc183c4d8c8b24fa89346c (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 'AUTHORS')
0 files changed, 0 insertions, 0 deletions