diff options
| author | Andreas Schwab <schwab@gcc.gnu.org> | 2004-08-20 11:37:13 +0000 |
|---|---|---|
| committer | Andreas Schwab <schwab@gcc.gnu.org> | 2004-08-20 11:37:13 +0000 |
| commit | f76f0f890d5e4275dbd8445612d36985cc5ebd92 (patch) | |
| tree | 536c9769cbe5d4dbc988a025e0a43042a19c1953 /ChangeLog | |
| parent | a9024779f1a66dc0e53913194d663a13ae598646 (diff) | |
| download | gcc-f76f0f890d5e4275dbd8445612d36985cc5ebd92.tar.gz | |
Remove conflict marker.
From-SVN: r86312
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 8c8fd1080fa..6976be88042 100644 --- 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. |