diff options
| author | l10n daemon script <[email protected]> | 2023-03-21 01:43:27 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2023-03-21 01:43:27 +0000 |
| commit | 53eba0b14c83b85edbd55962e49c6df3e0049380 (patch) | |
| tree | 82f3980805cde0c5f8b442cc6748b69e1fe0f300 /src/panels | |
| parent | 7b2847568f0af9311f26761d4d4da748f83d1054 (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