projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a902477)
Remove conflict marker.
authorAndreas Schwab <schwab@gcc.gnu.org>
Fri, 20 Aug 2004 11:37:13 +0000 (11:37 +0000)
committerAndreas Schwab <schwab@gcc.gnu.org>
Fri, 20 Aug 2004 11:37:13 +0000 (11:37 +0000)
From-SVN: r86312

ChangeLog patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index 8c8fd1080fa9d1d21284630ebd265fda36dae60d..6976be8804236cff2dd91220c6ad8be480584c6b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,7 +45,6 @@
        in the recursive `make', instead of hardwiring `all'.
        (Autogenerated TARGET-* variables): New.
 
->>>>>>> 1.967
 2004-08-13  Brian Booth  <bbooth@redhat.com>
 
        * MAINTAINERS: Remove myself from write-after-approval.