Remove _very_ old Conflicts
authorChristian Hofstaedtler <ch@grml.org>
Wed, 2 Nov 2011 15:17:30 +0000 (16:17 +0100)
committerChristian Hofstaedtler <ch@grml.org>
Wed, 2 Nov 2011 15:17:30 +0000 (16:17 +0100)

No differences found