projects / platform / upstream / binutils.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6e91790)
remove diff indicators
authorTimothy Wall <twall@alum.mit.edu>
Tue, 13 Nov 2001 14:23:41 +0000 (14:23 +0000)
committerTimothy Wall <twall@alum.mit.edu>
Tue, 13 Nov 2001 14:23:41 +0000 (14:23 +0000)
gas/testsuite/ChangeLog patch | blob | history

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index e888139..a78da36 100644 (file)
--- 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
Domain: System / Toolchain;