TortoiseGit/TortoiseGit — pull request #72 by YueLinHo (2014-01-27 22:58:33+00:00)
Title: Fixed issue #2089: Typo in German translation - 'Resolved' should be 'Konflikt bearbeitet'

Fixed issue #2089: Typo in German translation - 'Resolved' should be 'Konflikt bearbeitet'

Signed-off-by: Yue Lin Ho