projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 068e571)
Remove conflict indicators committed as part of revision 1.11335 by
authorGerald Pfeifer <gerald@gcc.gnu.org>
Sat, 15 Sep 2001 11:51:23 +0000 (11:51 +0000)
committerGerald Pfeifer <gerald@gcc.gnu.org>
Sat, 15 Sep 2001 11:51:23 +0000 (11:51 +0000)
echristo on 15-Sep-01.

From-SVN: r45630

gcc/ChangeLog patch | blob | history

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 17ddd38c9a78c3c2aab90cef09f9af887d1a0b60..6ea0c949f9cb77ca1d49ee51324dff47e741a3f2 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -196,7 +196,6 @@ Fri Sep 14 13:54:50 EDT 2001  John Wehle  (john@feith.com)
        * crti.asm: New file.
        * crtn.asm: New file.
 
->>>>>>> 1.11331
 2001-09-13  Neil Booth  <neil@daikokuya.demon.co.uk>
 
        * c-parse.in (_yylex): Use _cpp_backup_tokens.