projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 269ef14)
ChangeLog: Remove conflict marker, fix typo in date.
authorRichard Biener <rguenth@gcc.gnu.org>
Mon, 2 Jul 2007 13:29:57 +0000 (13:29 +0000)
committerRichard Biener <rguenth@gcc.gnu.org>
Mon, 2 Jul 2007 13:29:57 +0000 (13:29 +0000)
2007-07-02  Richard Guenther  <rguenther@suse.de>

* testsuite/ChangeLog: Remove conflict marker, fix typo in date.

From-SVN: r126204

gcc/testsuite/ChangeLog patch | blob | history

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a4cfc1f017a89af26359016cf316125c46d4feee..4bb958f5f505dec0211c09fa7526c5b8d67ffb41 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -139,7 +139,7 @@
        initialization and fix dg-final check - the initialization loop is
        vectorizable.
 
-2007-067-01  Uros Bizjak  <ubizjak@gmail.com>
+2007-07-01  Uros Bizjak  <ubizjak@gmail.com>
            Volker Reichelt  <reichelt@netcologne.de>
 
        PR middle-end/32559
@@ -291,7 +291,6 @@
        PR c++/32111
        * g++.dg/other/friend5.C: New test.
 
->>>>>>> .r126155
 2007-06-25  Paul Thomas  <pault@gcc.gnu.org>
 
        PR fortran/32464