projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 173b818)
fix typo.
authorBrian Booth <bbooth@gcc.gnu.org>
Thu, 22 Jul 2004 18:35:08 +0000 (18:35 +0000)
committerBrian Booth <bbooth@gcc.gnu.org>
Thu, 22 Jul 2004 18:35:08 +0000 (18:35 +0000)
From-SVN: r85056

gcc/ChangeLog patch | blob | history

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3672398b9cc4d7453b8bc60c25b6b05ed5f1167b..1c220812d4a1d1cf1f793834628598ad08a40083 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1514,7 +1514,6 @@
 
        * collect2.c (main):  Handle --no-demangle and --demangle flags.
 
->>>>>>> 2.4547
 2004-07-13  Sebastian Pop  <pop@cri.ensmp.fr>
 
        * Makefile.in (OBJS-common): Add tree-data-ref.o.