projects / sdk / tools / heaptrack.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 96815e8) | patch
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Sun, 26 Feb 2017 04:53:32 +0000 (05:53 +0100)
committerl10n daemon script <scripty@kde.org>
Sun, 26 Feb 2017 04:53:32 +0000 (05:53 +0100)
commit7fe121258f710a2e85f342a54d65db2bccf8e4e9
tree90e6761a6196f13783108203eccb4f136873a423tree | snapshot
parent96815e85e6a2129dbff97179ceb7fc07002bd63dcommit | 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;