Remove cvs conflict indicator.

This commit is contained in:
Elena Zannoni 2001-02-20 00:12:40 +00:00
parent a858089e45
commit f07e76c6c1

View File

@ -126,7 +126,6 @@
* f-exp.y: Include <ctype.h>.
(parse_number): Ensure that ``i'' is always initialized.
>>>>>>> 1.966
2001-02-14 Jim Kingdon <jkingdon@engr.sgi.com>
* MAINTAINERS: Add myself to paper trail section.