diff noffle.conf.example @ 400:523ab39710d4 noffle

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