| commit | b951e23ba59be8d00128661d7baff1ec06177532 | |
| author | l10n daemon script <scripty@kde.org> | |
| Thu, 17 Sep 2015 11:59:09 +0000 (17 11:59 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Thu, 17 Sep 2015 11:59:09 +0000 (17 11:59 +0000) | ||
| tree | 271739a65f650f132130682a4d70e1194c117cbd | treesnapshot (tar.gz zip) |
| parent | b838b7c459bd7ff6dadff3f85cd0416672478429 | commitdiff |
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"
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"