Remove conflict marker.

From-SVN: r53217

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index ef79042f94dcee771310cf8510fef50e761e73df..e1f81819d79e02235d47d0fab9437b69b21b27b9 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -22,7 +22,6 @@
        * include/dwarf2-signal.h (INIT_SEGV, INIT_FPE): Don't use
        __libc_sigaction on Sparc.
 
->>>>>>> 1.1197.2.110
 2002-04-25  David S. Miller  <davem@redhat.com>
 
        PR target/6422