projects / platform / upstream / linaro-gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b0b8d18)
Remove spurious conflict marker
authorneroden <neroden@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 3 Aug 2004 20:33:52 +0000 (20:33 +0000)
committerneroden <neroden@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 3 Aug 2004 20:33:52 +0000 (20:33 +0000)
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@85499 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/ChangeLog patch | blob | history

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4c306f4..9d0199d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -28,7 +28,6 @@
 
        * config/i386/gmm_malloc.h: New file.
 
->>>>>>> 2.4781
 2004-08-03  Dale Johannesen  <dalej@apple.com>
 
        * config/rs6000/rs6000.c (machopic_output_stub):  Align Darwin stubs.
Domain: System / Toolchain;