cvs server: conflicts found in gcc/c-parse.c

[Jeffrey A Law]

  In message < u9d8g8ld0i.fsf@yorick.cygnus.com >you write:
  > BTW, how would people feel about removing some of the generated files from
  > CVS?  I think it's reasonable to expect people using the CVS repository to
  > have bison installed.
I'd vote yes for this :-)

jeff