Remove conflict marker

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@32096 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8ad693a..ef3c26e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -145,7 +145,6 @@ Fri Feb 18 20:08:57 2000  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
        * config/alpha/alpha.h (INITIAL_ELIMINATION_OFFSET): Add abort
        in unhandled case.
 
->>>>>>> 1.5739
 2000-02-18  Nick Clifton  <nickc@cygnus.com>
 
        * config/arm/elf.h (ASM_OUTPUT_ALIGN): Do not generate