diff options
| author | l10n daemon script <[email protected]> | 2022-04-18 02:45:08 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-04-18 02:45:08 +0000 |
| commit | 4012ea30c9061a5259c96de64aca114cec5014aa (patch) | |
| tree | 3dc0471472dd81047c1520049aa3de2709f6210c /src/global.cpp | |
| parent | 06bd5b2ee9324e268da2e5c0cf54bc8d8d725ae9 (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/global.cpp')
0 files changed, 0 insertions, 0 deletions