tree 44d98b003578cb78c6865c193b45babfe1c4f668
parent c203551876681a05e2f7e0e0af2c1f8eb295799f
author Thorsten Schöning <tschoening@am-soft.de> 1534681983 +0200
committer Thorsten Schöning <tschoening@am-soft.de> 1534681983 +0200

LOGCXX-500: Conflict wrongly resolved.