diff options
| author | l10n daemon script <[email protected]> | 2022-01-24 01:45:03 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-01-24 01:45:03 +0000 |
| commit | f3cf4e3ae11055f297c8dfbe70ca6a3faa61dae7 (patch) | |
| tree | f6678ad99a2c32a607d3859000f010302032e123 /src/panels | |
| parent | d192c8984f350ef6a897f1eac5a13708b485152d (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