diff options
| author | David Edelsohn <dje@gcc.gnu.org> | 2016-12-01 08:48:22 -0500 |
|---|---|---|
| committer | David Edelsohn <dje@gcc.gnu.org> | 2016-12-01 08:48:22 -0500 |
| commit | 8e9c33cd3bd55c2364a2efc7fc2de0957d7b991d (patch) | |
| tree | 58beccd67788802125771b0f5150dd48fe1975f0 /gcc | |
| parent | 825fba526ce816bd26887457e2f0f4ca05b1ccdd (diff) | |
| download | gcc-8e9c33cd3bd55c2364a2efc7fc2de0957d7b991d.zip gcc-8e9c33cd3bd55c2364a2efc7fc2de0957d7b991d.tar.gz gcc-8e9c33cd3bd55c2364a2efc7fc2de0957d7b991d.tar.bz2 | |
Remove svn conflict marker.
From-SVN: r243110
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 a164a01..4d15a73 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -38,7 +38,6 @@ PR rtl-optimization/78607 * combine.c (try_combine): Emit a barrier after a unconditional trap. ->>>>>>> .r243107 2016-11-30 Michael Meissner <meissner@linux.vnet.ibm.com> PR target/78602 |