diff options
| author | l10n daemon script <[email protected]> | 2015-04-24 09:52:38 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2015-04-24 09:52:38 +0000 |
| commit | 0daae5336714c2124171ca89415eb8bf6098519d (patch) | |
| tree | 70ecc703522ecc885f3c7b029674e33727581dcf /src/main.cpp | |
| parent | 975d0d7bfa2994fd5d13f40a70ea0851c702674f (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