diff options
| author | l10n daemon script <[email protected]> | 2025-09-25 01:35:17 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-09-25 01:35:17 +0000 |
| commit | 0778b805cd823172f179809f535048c41bccef8d (patch) | |
| tree | 1a9cc482825dfb633ab1e7107f03da8b26432031 /src/main.cpp | |
| parent | eb94e6dd675da09f1d8979be42ced179ec853a23 (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