fix cvs merge detritus

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 9b6a501b3136b148d55317e69f84b71d6e03d152..b560ebc844f6cd90da46481605e0cf340efe050b 100644 (file)
--- 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.