diff options
| author | l10n daemon script <[email protected]> | 2024-06-28 01:27:14 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-06-28 01:27:14 +0000 |
| commit | 08347a59c0a442c42b6c97c692b6d4aabb2e70df (patch) | |
| tree | 079bd612ebaee083b7d2109bf066e04564ff1d9d /po | |
| parent | 3a54a369d9115fa66ed474c4eee3ef51b300db3c (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