From 8239d6c313265003e2d28bd4b7fdd0b613ce5635 Mon Sep 17 00:00:00 2001
From: Richard Henderson <rth@gcc.gnu.org>
Date: Tue, 25 Aug 1998 05:24:31 -0700
Subject: [PATCH] Oops.  forgot to kill the >>> from the conflict.

From-SVN: r21969
---
 gcc/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4e1dd654b93..d5cc7974308 100644
--- 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.
-- 
2.30.2