procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove svn conflict marker.

Browse source 
From-SVN: r243110
This commit is contained in:
David Edelsohn 2016-12-01 08:48:22 -05:00
parent 825fba526c
commit 8e9c33cd3b
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gcc/ChangeLog
View file

@ -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