From 37dfec76fdcf4da5bc04ca354d7d7bb08b49faec Mon Sep 17 00:00:00 2001 From: "K. Richard Pixley" Date: Sat, 14 Mar 1992 03:09:49 +0000 Subject: [PATCH] fix cvs merge detritus --- gas/ChangeLog | 3 --- 1 file changed, 3 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 9b6a501b313..b560ebc844f 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,15 +1,12 @@ -<<<<<<< ChangeLog Fri Mar 13 15:45:44 1992 K. Richard Pixley (rich@cygnus.com) * Makefile.in: pass down MAKEINFO explicitly on info. -======= Fri Mar 13 08:03:03 1992 Steve Chamberlain (sac@thepub.cygnus.com) * flonum-const.c: renamed flonum-konst.c to stop dos name conflict. ->>>>>>> 1.43 Wed Mar 11 23:32:42 1992 K. Richard Pixley (rich@cygnus.com) * configure.in: vxworks68 gets te-sun3.h. -- 2.30.2