diff options
| author | l10n daemon script <[email protected]> | 2026-03-21 01:42:09 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2026-03-21 01:42:09 +0000 |
| commit | 57a3dbe6b1913af0788a7b8ec98b93c149aa5d0e (patch) | |
| tree | e05167d7585bb885334ce7d6857e48fcea00f7fd /src/dbusinterface.cpp | |
| parent | d50b7c8716db61624adf4419dc3496ed6d904ee3 (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