diff options
| author | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-04-06 21:24:17 +0000 |
|---|---|---|
| committer | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-04-06 21:24:17 +0000 |
| commit | 24fbb6038f8768e9a8e7ad118abfd18b9f6aa221 (patch) | |
| tree | 216471f69b8e9f974421770065bcd4a91b821972 /gcc | |
| parent | fe0b46c18ab2c2f320244dffd1d48674177c4389 (diff) | |
| download | gcc-24fbb6038f8768e9a8e7ad118abfd18b9f6aa221.tar.gz | |
Remove ">>>>>>> .r123627".
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@123629 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index eca498c96c7..d5f8559c1ac 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -23,7 +23,6 @@ mode macro. (*truncxf?f_i387 splitter): Ditto. ->>>>>>> .r123627 2007-04-06 Daniel Berlin <dberlin@dberlin.org> * langhooks-def.h (LANG_HOOKS_INITIALIZER): Remove |