fix conflict markers

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 48af490..ed2a94b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -204,10 +204,6 @@
        (ia64_gimplify_va_arg): New fn.
        * config/rs6000/rs6000.c (rs6000_gimplify_va_arg): New fn.
        (TARGET_GIMPLIFY_VA_ARG_EXPR): Define.
-<<<<<<< ChangeLog
-=======
-       * config/sparc/sparc.c (sparc_gimplify_va_arg): New fn.
->>>>>>> 2.3910
        * alias.c (get_varargs_alias_set): Just return 0 for now.
        
        * c-objc-common.c (c_tree_printer): Improve handling of %T.
@@ -300,15 +296,6 @@
 
 2004-06-08  Richard Henderson  <rth@redhat.com>
 
-<<<<<<< ChangeLog
-       * gimple-low.c (struct lower_data): Replace the_return_label and
-       one_return_stmt with return_statements.
-       (lower_function_body): Process the entire list of return_statements.
-       (lower_return_expr): Check source value before unifying return_exprs.   
-       * gimplify.c (gimplify_return_expr): Force the use of a temporary
-       for !aggregate_value_p.
-       * tree-gimple.c: Update RETURN_EXPR grammer.
-=======
        * gimple-low.c (struct lower_data): Replace the_return_label and
        one_return_stmt with return_statements.
        (lower_function_body): Process the entire list of return_statements.
@@ -316,7 +303,6 @@
        * gimplify.c (gimplify_return_expr): Force the use of a temporary
        for !aggregate_value_p.
        * tree-gimple.c: Update RETURN_EXPR grammer.
->>>>>>> 2.3910
 
 2004-06-08  Vladimir Makarov  <vmakarov@redhat.com>