Remove CVS merge markers.
This commit is contained in:
parent
bbf7e43ddc
commit
4a99cebf62
1 changed files with 0 additions and 1 deletions
|
@ -47,7 +47,6 @@ Tue Jan 11 13:01:20 1994 Ian Lance Taylor (ian@tweedledumb.cygnus.com)
|
|||
emitting nop instructions.
|
||||
* Makefile.in (listing.o): Depends upon subsegs.h.
|
||||
|
||||
>>>>>>> 1.484
|
||||
Mon Jan 10 09:52:23 1994 Jeffrey A. Law (law@snake.cs.utah.edu)
|
||||
|
||||
* config/tc-hppa.c (pa_ip): Put check for missing label on .PROC
|
||||
|
|
Loading…
Add table
Reference in a new issue