aboutsummaryrefslogtreecommitdiff
path: root/gas/config/.Sanitize
diff options
context:
space:
mode:
authorJim Wilson <wilson@tuliptree.org>1992-08-31 00:01:22 +0000
committerJim Wilson <wilson@tuliptree.org>1992-08-31 00:01:22 +0000
commitc6b16054ea2c56c2d610b9b1ad7ef4503c08d8da (patch)
treed14c1341dbc699bc2ac229543319031ff25148df /gas/config/.Sanitize
parentb0952e128d5b7bcf6beec0b8ba9afa355d51a4c2 (diff)
downloadgdb-c6b16054ea2c56c2d610b9b1ad7ef4503c08d8da.zip
gdb-c6b16054ea2c56c2d610b9b1ad7ef4503c08d8da.tar.gz
gdb-c6b16054ea2c56c2d610b9b1ad7ef4503c08d8da.tar.bz2
Resolve someone else's CVS update conflict.
Diffstat (limited to 'gas/config/.Sanitize')
-rw-r--r--gas/config/.Sanitize8
1 files changed, 4 insertions, 4 deletions
diff --git a/gas/config/.Sanitize b/gas/config/.Sanitize
index 19e7ea9..46f4e07 100644
--- a/gas/config/.Sanitize
+++ b/gas/config/.Sanitize
@@ -119,10 +119,7 @@ te-sun3.h
te-sysv32.h
vax-inst.h
vms
-<<<<<<< .Sanitize
z8k.mt
-=======
->>>>>>> 1.23
@@ -144,7 +141,10 @@ echo Done in `pwd`.
#
#
# $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
#
# Revision 1.23 1992/07/23 18:23:44 gumby