diff options
| author | l10n daemon script <scripty@kde.org> | 2015-03-26 04:46:00 +0000 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2015-03-26 04:46:00 +0000 |
| commit | 4c970221f8ba7506e96ae7655fee0c4c27768102 (patch) | |
| tree | 1000d280087cffcfd6634867c04283e510e804be /src/data/jquery-1.7.2.min.js | |
| parent | Add missing colon (diff) | |
| download | rekonq-4c970221f8ba7506e96ae7655fee0c4c27768102.tar.xz | |
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/data/jquery-1.7.2.min.js')
0 files changed, 0 insertions, 0 deletions