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

index e88813999bfbd676f451a555f795f062df7a871a..a78da369736b769a49319e63380bcb0a5883e258 100644 (file)
@@ -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