diff options
| author | l10n daemon script <[email protected]> | 2024-06-30 01:20:00 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-06-30 01:20:00 +0000 |
| commit | 5eb3240e165ba9875c54ac47c4badf0260653d47 (patch) | |
| tree | 9eeee6af17a5a94af188e264219d399618e25f3b /src/admin/bar.cpp | |
| parent | 44b05452c3b22a38127f0afa56a23365db23b8c0 (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/admin/bar.cpp')
0 files changed, 0 insertions, 0 deletions