diff options
| author | Andreas Schwab <schwab@gcc.gnu.org> | 2008-08-01 13:14:39 +0000 |
|---|---|---|
| committer | Andreas Schwab <schwab@gcc.gnu.org> | 2008-08-01 13:14:39 +0000 |
| commit | 62bb3fdb864d5eaad007ccf4c0afffc372915d5d (patch) | |
| tree | 9ebb3d94cf0871ff1cb3798fba36575190e57a1f /gcc | |
| parent | df8fa7003b452e9d210930161e2ed2daa094cc86 (diff) | |
| download | gcc-62bb3fdb864d5eaad007ccf4c0afffc372915d5d.zip gcc-62bb3fdb864d5eaad007ccf4c0afffc372915d5d.tar.gz gcc-62bb3fdb864d5eaad007ccf4c0afffc372915d5d.tar.bz2 | |
Remove conflict marker.
From-SVN: r138516
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index dc1c260..42c6c42 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -96,7 +96,6 @@ (dwarf2out_stack_adjust): Use it. (dwarf2out_frame_debug_expr): Likewise. ->>>>>>> .r138449 2008-07-31 Richard Guenther <rguenther@suse.de> PR tree-optimization/36978 |