| commit | 08377747514721f85b56a2ceebd2aab612e7c7b0 | |
| author | l10n daemon script <scripty@kde.org> | |
| Sun, 10 Jan 2016 11:43:07 +0000 (10 11:43 +0000) | ||
| committer | l10n daemon script <scripty@kde.org> | |
| Sun, 10 Jan 2016 11:43:07 +0000 (10 11:43 +0000) | ||
| tree | 9073f52d5ac6985747951566f059fdf80b20b358 | treesnapshot (tar.gz zip) |
| parent | 59b5a9033d615aad869e05050fa111e7a4718a6c | 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"
| akregator/configuration/akregator_config_advanced.desktop | diffblobblamehistory | |
| storageservicemanager/data/storageservicemanager.notifyrc | diffblobblamehistory |