projects / platform / upstream / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 70635f1)
Fixed ChangeLog merge snafu
authorTom Tromey <tromey@gcc.gnu.org>
Thu, 27 Apr 2000 00:45:13 +0000 (00:45 +0000)
committerTom Tromey <tromey@gcc.gnu.org>
Thu, 27 Apr 2000 00:45:13 +0000 (00:45 +0000)
From-SVN: r33453

boehm-gc/ChangeLog patch | blob | history

diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index c2aa927..fd02f6a 100644 (file)
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< ChangeLog
 2000-04-26  Jakub Jelinek  <jakub@redhat.com>
 
        * gcconfig.h (SPARC): Define ALIGNMENT to 8 for 64bit SPARC.
Domain: System / Toolchain;