Tobias Berner Sun, 06 Nov 2016 14:00:06 -0800
SVN commit 13287 by tcberner: Set conflict on skrooge-kde4
M +2 -0 Makefile