From: Ian Lance Taylor <ian@airs.com>
Date: Wed, 12 Jan 1994 19:18:56 +0000 (+0000)
Subject: Remove CVS merge markers.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4a99cebf627de8b6e0cf5eff68ea53a3369bdc4f;p=binutils-gdb.git

Remove CVS merge markers.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 21241f3ddf5..781a204dde7 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -47,7 +47,6 @@ Tue Jan 11 13:01:20 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
 	emitting nop instructions.
 	* Makefile.in (listing.o): Depends upon subsegs.h.
 
->>>>>>> 1.484
 Mon Jan 10 09:52:23 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
 
 	* config/tc-hppa.c (pa_ip): Put check for missing label on .PROC