diff options
| author | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-08-27 16:27:30 +0000 |
|---|---|---|
| committer | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-08-27 16:27:30 +0000 |
| commit | 0065d92f0dc45afbcb52b077aa4a95b56bbe54b2 (patch) | |
| tree | 7fc04ff601b11be2388125ab260245c87d18b082 | |
| parent | 003d2e923649ed7ea75e0f1e3f83d2807b9a1edc (diff) | |
| download | ppe42-gcc-0065d92f0dc45afbcb52b077aa4a95b56bbe54b2.tar.gz ppe42-gcc-0065d92f0dc45afbcb52b077aa4a95b56bbe54b2.zip | |
Remove <<<<<<
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_9-branch@214577 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0047e23578a..3610de6515a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -157,7 +157,6 @@ OMP_CLAUSE_SHARED for global vars if the global var is mentioned in OMP_CLAUSE_MAP in some outer target region. ->>>>>>> .r214216 2014-08-14 Kyrylo Tkachov <kyrylo.tkachov@arm.com> Backport from mainline |
