This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Remove conflict marker from ChangeLog


Howdy,

This is embarassing.  I introduced a conflict marker into the
ChangeLog, so I committed the following as obvious.

-- 
Matt Kraai <kraai@alumni.cmu.edu>
Debian GNU/Linux Peon

Index: gcc/ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ChangeLog,v
retrieving revision 1.17951
retrieving revision 1.17952
diff -3 -c -p -r1.17951 -r1.17952
*** gcc/ChangeLog	30 May 2003 00:43:04 -0000	1.17951
--- gcc/ChangeLog	30 May 2003 00:50:32 -0000	1.17952
***************
*** 51,57 ****
  	(expand_unreachable_stmt): Expand unreachable while statements
  	using genrtl_do_stmt_1.
  
- >>>>>>> 1.17950
  2003-05-29  Richard Sandiford  <rsandifo@redhat.com>
  
  	* config/mips/mips-protos.h (mips_output_load_label): Declare.
--- 51,56 ----


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]