diff options
| author | l10n daemon script <[email protected]> | 2018-04-03 05:25:54 +0200 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2018-04-03 05:25:54 +0200 |
| commit | aee551e80b5feca5e8a320115424d889057312a0 (patch) | |
| tree | 930794153a5b846dd4dd67168c51b12c4d400dbe /src/settings/settingspagebase.cpp | |
| parent | 1441fefc07f126c1c9eddc3e9f1babff8b762b28 (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/settingspagebase.cpp')
0 files changed, 0 insertions, 0 deletions