From 0dfe746f7456c774309a6f68319d77a26af6cee4 Mon Sep 17 00:00:00 2001
From: Timothy Wall <twall@alum.mit.edu>
Date: Tue, 13 Nov 2001 14:23:41 +0000
Subject: remove diff indicators

---
 gas/testsuite/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

(limited to 'gas')

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index e888139..a78da36 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -75,7 +75,6 @@
 
 	* gas/mmix: New testsuite directory.
 
->>>>>>> 1.244
 2001-10-24  Chris Demetriou  <cgd@broadcom.com>
 
 	* gas/mips/ld-empic.d: Remove extra whitespace at beginning of
-- 
cgit v1.1