Tobias Berner Sun, 06 Nov 2016 10:48:06 -0800
SVN commit 13261 by tcberner: Let's see if conflicts can be handled like this
M +2 -0 kde.mk