diff options
| author | l10n daemon script <[email protected]> | 2015-12-09 09:04:05 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-12-09 09:04:05 +0000 |
| commit | 2d8448f88d21c8eb8ac89498ca34fc6c12eab3db (patch) | |
| tree | c8aec4d9a98496599485b26a6f8a2cf56cc87713 /src/settings | |
| parent | c0d5537afb10f09aaa6b47a994e8f8024c1006b4 (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