Update for the brave new world
[mmh] / uip / conflict.c
1999-04-30 Doug MorrisInitial revision