diff options
| author | l10n daemon script <[email protected]> | 2024-12-02 01:33:32 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-12-02 01:33:32 +0000 |
| commit | fb5c292555513f047fbc3a9963ad40bd81a4b96f (patch) | |
| tree | 529da0946a6851e551a00a17e144aa60a2263c01 /src/settings | |
| parent | deb43c91233eef838c43af22dd0216045d89b430 (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/settings')
0 files changed, 0 insertions, 0 deletions