| commit | 6e711570dd0a54492822b52218de7a4502027044 | |
| author | l10n daemon script <scripty@kde.org> | |
| Sun, 17 Jul 2016 15:20:23 +0000 (17 15:20 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Sun, 17 Jul 2016 15:20:23 +0000 (17 15:20 +0000) | ||
| tree | 00e22ac81b84c1213b94cf4feefe387d42016ce8 | treesnapshot (tar.gz zip) |
| parent | 6033426d43f0f49a8ffefc7a81599d1dbfab58a5 | 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"
| knotes/src/print/themes/big-title/theme.desktop | diffblobblamehistory | |
| storageservicemanager/data/storageservicemanager.notifyrc | diffblobblamehistory |