Oops. forgot to kill the >>> from the conflict.

From-SVN: r21969

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4e1dd654b93454cb975499ed78b45ff3bdf2a357..d5cc7974308fd350ec9d8f51552d4c70d3412b92 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -70,7 +70,6 @@ Mon Aug 24 15:20:19 1998  David Edelsohn  <edelsohn@mhpcc.edu>
        (movdf_softfloat32, movdf_hardfloat64, movdf_softfloat64): Change
        'o' to 'm' for GPR variant constraints.
 
->>>>>>> 1.1938
 Mon Aug 24 10:25:46 1998  Jeffrey A Law  (law@cygnus.com)
 
         * loop.c (scan_loop): Honor AVOID_CC_MODE_COPIES.