Remove cvs conflict indicator.
This commit is contained in:
parent
a858089e45
commit
f07e76c6c1
@ -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.
|
||||
|
Loading…
Reference in New Issue
Block a user