diff options
| author | l10n daemon script <[email protected]> | 2024-07-03 01:20:28 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-07-03 01:20:28 +0000 |
| commit | 98ff038416c5fc539d5cce0fbcae47b5e878cd58 (patch) | |
| tree | 28b95e49dbf5d51722b96dfe6b43cdf304a0e4f9 /src/admin/bar.cpp | |
| parent | aeb2b11fe452f2cb341e20e7d44aadf8a4e8d271 (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