Remove cvs conflict markers.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6179ff0..2f628f3 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -10,7 +10,6 @@ Wed Oct 13 00:09:18 1999  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>
        * libgcc2.c (__do_global_dtors): Protect __deregister_frame_info
        from multiple calls.
 
->>>>>>> 1.4674
 Thu Oct 14 04:54:54 1999  Richard Henderson  <rth@cygnus.com>
 
        * i386.md (call value patterns): Move to the end of the file.
@@ -267,7 +266,6 @@ Wed Oct 13 10:07:54 1999  Richard Henderson  <rth@cygnus.com>
        (struct rtvec_def): Likewise.
        * tree.h (struct tree_common): Likewise.
 
->>>>>>> 1.4673
 Wed Oct 13 01:44:29 1999  Carol LePage  <carolo@hal.com>
 
         * configure.in (sparc-hal-solaris2*): Fix xm_file, xm_defines,
@@ -314,7 +312,6 @@ Tue Oct 12 07:38:41 1999  Bruce Korb  <autogen@linuxbox.com>
        * fixincl/fixlib.h: protect against doubly defining t_bool
        * fixincl/server.h: protect against doubly defining t_bool
 
->>>>>>> 1.4648
 Mon Oct 11 20:18:41 1999  Jim Wilson  <wilson@cygnus.com>
 
        * genoutput.c: Include toplev.h.