remove conflict indicator.

This commit is contained in:
David Taylor 2001-02-27 21:58:33 +00:00
parent 993f3aa5bc
commit 3078eca931

View File

@ -543,7 +543,6 @@ Wed Feb 7 19:41:21 2001 Andrew Cagney <cagney@redhat.com>
(fill_fpregset): Likewise.
(supply_fpregset): Likewise.
>>>>>>> 1.973
Tue Feb 6 11:58:57 2001 David Taylor <taylor@redhat.com>
* valops.c (value_cast): If casting a scalar to a pointer, do not