diff options
| author | l10n daemon script <[email protected]> | 2022-08-21 01:51:22 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-08-21 01:51:22 +0000 |
| commit | b5de7d79456227aa5a933f9b7e429d004ecb8949 (patch) | |
| tree | 65ed07bf9a0238372bb8caca1e82e158f0f56e22 /src/dbusinterface.cpp | |
| parent | 3ccdcc2176bc5e4e03f733c21d05a5a4b0c1af25 (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/dbusinterface.cpp')
0 files changed, 0 insertions, 0 deletions