procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove the residuals of a previous merge conflict.

Browse source 
From-SVN: r66826
This commit is contained in:
Wolfgang Bangerth 2003-05-15 09:02:27 -06:00
parent 486772b126
commit ce000d1eec
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gcc/ChangeLog
View file

@ -587,7 +587,6 @@ Mon May 12 11:32:53 CEST 2003 Jan Hubicka <jh@suse.cz>
(s390_function_arg): Likewise.
(s390_va_arg): Likewise
>>>>>>> 1.17806
2003-05-11 Nathan Sidwell <nathan@codesourcery.com>
* coverage.h (coverage_counter_alloc): New function.