diff options
| author | l10n daemon script <[email protected]> | 2022-07-10 01:53:09 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-07-10 01:53:09 +0000 |
| commit | 7fdd9f22d8cef4d07576336bd7c50fc0f31fd849 (patch) | |
| tree | 5f99bb997035adfea408453df3faea680b6a3062 /src/panels/folders | |
| parent | 35244bec7574b1e95fc0c7d51b96bf634673b391 (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/folders')
0 files changed, 0 insertions, 0 deletions