K 10 svn:author V 5 peter K 8 svn:date V 27 2000-01-29T18:07:07.000000Z K 7 svn:log V 206 Remove 'conflicts' token - it has been effectively doing absolutely nothing for quite some time. The only thing that cared was userconfig, but it was for one invisible device so we never saw it's effects. END