diff options
| author | l10n daemon script <[email protected]> | 2024-01-10 02:08:59 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-01-10 02:08:59 +0000 |
| commit | 7e02110c64b178f16519ee3be6a4d460e967236d (patch) | |
| tree | 45c994da72222871f9a7e87e830d69690f70f95d /src/panels | |
| parent | b625a44a697f863aad92b7cf9c67548c84bc262d (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