diff options
| author | l10n daemon script <[email protected]> | 2022-07-25 01:46:13 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-07-25 01:46:13 +0000 |
| commit | ef042cbefef0eb1b84336c1d680b5f52bb9557fe (patch) | |
| tree | 2d24bb7ce60db49428faff7d8a650e07074447eb /src/main.cpp | |
| parent | f0749ee42ccb2e0a7caee165b9934de8e61bfcbc (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/main.cpp')
0 files changed, 0 insertions, 0 deletions