diff debian/conf.debian @ 400:523ab39710d4 noffle

[svn] re-added conflicts
author godisch
date Tue, 03 Jun 2003 22:22:55 +0100
parents 3b5b7f3fd71f
children f52f39cdc1c2
line wrap: on
line diff