diff options
| author | l10n daemon script <[email protected]> | 2025-06-11 01:35:45 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-06-11 01:35:45 +0000 |
| commit | 7212513034b1181cc8efd439bb3ccde5481a3ecd (patch) | |
| tree | e86f26eba193e1c4138f146c3c581ebc7a5f9933 /po | |
| parent | 483faa05cf265615f9a896171122c473477ec6a3 (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 'po')
0 files changed, 0 insertions, 0 deletions