diff options
| author | l10n daemon script <[email protected]> | 2024-07-07 01:19:17 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-07-07 01:19:17 +0000 |
| commit | 7f9f164b57dd50b40374e93d66803c426a39ab33 (patch) | |
| tree | 2ff5b0888fdf196740fb20b898948f602e608228 /src/statusbar | |
| parent | e87a3a87f3d1600e84f7948996a3da34c27dcc58 (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/statusbar')
0 files changed, 0 insertions, 0 deletions