diff options
| author | l10n daemon script <[email protected]> | 2022-02-06 01:58:24 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-02-06 01:58:24 +0000 |
| commit | 32c072fe5f78efbcb76187ed535190d3a0e869f3 (patch) | |
| tree | e3da3b55f0585118edeb98c575b4ae342232fad0 /src/panels | |
| parent | 0dac70d059551ad143b9bb9849efb28840b7ba4b (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