diff options
| author | l10n daemon script <[email protected]> | 2024-08-10 01:29:40 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-08-10 01:29:40 +0000 |
| commit | bc6803eeefd3d9c9a2f426f5677dd8373a37343a (patch) | |
| tree | 77243646a9de9399896ea99c4b0142427ff31b85 /src/main.cpp | |
| parent | f122b2e04aa89e0dce5a4f83bb3b9dba950d9985 (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/main.cpp')
0 files changed, 0 insertions, 0 deletions