You need to sign in or sign up before continuing.
Commit ce000d1e by Wolfgang Bangerth

Remove the residuals of a previous merge conflict.

From-SVN: r66826
parent 486772b1
...@@ -587,7 +587,6 @@ Mon May 12 11:32:53 CEST 2003 Jan Hubicka <jh@suse.cz> ...@@ -587,7 +587,6 @@ Mon May 12 11:32:53 CEST 2003 Jan Hubicka <jh@suse.cz>
(s390_function_arg): Likewise. (s390_function_arg): Likewise.
(s390_va_arg): Likewise (s390_va_arg): Likewise
>>>>>>> 1.17806
2003-05-11 Nathan Sidwell <nathan@codesourcery.com> 2003-05-11 Nathan Sidwell <nathan@codesourcery.com>
* coverage.h (coverage_counter_alloc): New function. * coverage.h (coverage_counter_alloc): New function.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment