From c7a535938ed0ac4a601897462e0012ed7b2430e1 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Tue, 4 Aug 1992 21:41:14 +0000 Subject: [PATCH] delete cvs merge cruft --- gas/ChangeLog | 1 - 1 file changed, 1 deletion(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index c154fa5d664..1d2c2450a5b 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -117,7 +117,6 @@ Mon Jun 1 16:20:22 1992 Michael Tiemann (tiemann@cygnus.com) * configure.in: recognize m680x0 as having sun3 emulation mode for vxworks environment. ->>>>>>> 1.62 Sun May 31 05:33:00 1992 david d `zoo' zuhn (zoo@cygnus.com) * configure.in: recognize m680x0 as an m68k -- 2.30.2