diff options
| author | amylaar <amylaar@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-11-11 18:40:04 +0000 |
|---|---|---|
| committer | amylaar <amylaar@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-11-11 18:40:04 +0000 |
| commit | 052ffc45d8ec0f6f1aac7d82e227d11aed37f3fa (patch) | |
| tree | 6269ac323be70e3ff7d6bd1cb07493dfbf578c26 | |
| parent | 56080003ab9fddd8f96e2d17958362d450ec4047 (diff) | |
| download | gcc-052ffc45d8ec0f6f1aac7d82e227d11aed37f3fa.tar.gz | |
Remove ChangeLog merge turd from r204590.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@204680 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/testsuite/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7ceba705781..b7a8ff8696c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -83,7 +83,6 @@ gcc.dg/c11-atomic-2.c, gcc.dg/c11-atomic-3.c, gcc.dg/c90-atomic-1.c, gcc.dg/c99-atomic-1.c: New tests. ->>>>>>> .r204589 2013-11-07 Cong Hou <congh@google.com> * gcc.dg/vect/vect-alias-check.c: New. |