Remove conflict marker.

From-SVN: r114928

Remove conflict marker.
From-SVN: r114928
410ed785 · Andreas Schwab · 4e2bb0a4 · 410ed785
Commit 410ed785 authored Jun 23, 2006 by Andreas Schwab
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletions

gcc/ChangeLog
+0 -1

No files found.
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -35,7 +35,6 @@
 	* reload1.c (gen_reload): Call mark_jump_label on the new insns
 	generated by gen_move_insn to add REG_LABEL notes if necessary.

->>>>>>> .r114926
 2006-06-22  Bob Wilson  <bob.wilson@acm.org>

 	* config/xtensa/lib1funcs.asm (MIN_ESA): Delete.