projects / sdk / tools / heaptrack.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 07f35ed) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Thu, 23 Feb 2017 05:11:51 +0000 (06:11 +0100)
committerl10n daemon script <scripty@kde.org>
Thu, 23 Feb 2017 05:11:51 +0000 (06:11 +0100)
commit6785a473a72789641237fe481474a2546836c2b7
tree5e401da975792d91e4510453ec0f941b4530ccbatree | snapshot
parent07f35ed8775abe0d7fd90272b22b39c21cbef3a1commit | 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"
src/analyze/gui/org.kde.heaptrack.desktop diff | blob | history
Domain: SDK / Command line tools;