espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-24 20:28:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Resolve someone else's CVS update conflict.

Browse Source
This commit is contained in:
Jim Wilson
1992-08-31 00:01:22 +00:00
parent b0952e128d
commit c6b16054ea
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gas/config/.Sanitize
View File

@ -119,10 +119,7 @@ te-sun3.h
te-sysv32.h te-sysv32.h
vax-inst.h vax-inst.h
vms vms
<<<<<<< .Sanitize
z8k.mt z8k.mt
=======
>>>>>>> 1.23
@ -144,7 +141,10 @@ echo Done in `pwd`.
# #
# #
# $Log$ # $Log$
# Revision 1.24 1992/08/25 22:12:38 sac # Revision 1.25 1992/08/31 00:01:22 wilson
# Resolve someone else's CVS update conflict.
#
# Revision 1.24 1992/08/25 22:12:38 sac
# Support for the Z8k # Support for the Z8k
# #
# Revision 1.23 1992/07/23 18:23:44 gumby # Revision 1.23 1992/07/23 18:23:44 gumby