diff options
| author | l10n daemon script <[email protected]> | 2025-07-13 01:35:02 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-07-13 01:35:02 +0000 |
| commit | 43cc016f8b3ec48157a86815a050518a41b423b2 (patch) | |
| tree | aa110ed3280cda47ba5c3b471cea1518be6bbca2 /src/panels | |
| parent | bdbbb1dcc15910c67b7b7c44cccb24f4f9eafd6d (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/panels')
0 files changed, 0 insertions, 0 deletions