From: Jim Wilson <wilson@tuliptree.org>
Date: Mon, 31 Aug 1992 00:01:22 +0000 (+0000)
Subject: Resolve someone else's CVS update conflict.
X-Git-Tag: gdb-4_18-branchpoint~21204
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c6b16054ea2c56c2d610b9b1ad7ef4503c08d8da;p=thirdparty%2Fbinutils-gdb.git

Resolve someone else's CVS update conflict.
---

diff --git a/gas/config/.Sanitize b/gas/config/.Sanitize
index 19e7ea9f1a5..46f4e075245 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