diff options
| author | l10n daemon script <[email protected]> | 2022-12-30 02:12:34 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2022-12-30 02:12:34 +0000 |
| commit | 36fda229fef526ae306c6efbaa5b26ec5e8dcfce (patch) | |
| tree | 27305498dbe311b49514376d4d867d44cf8549ee /src/settings/trash | |
| parent | 88c504b38119fe76230630b276d078d636855153 (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/trash')
0 files changed, 0 insertions, 0 deletions