diff options
| author | Brian Ford <Brian.Ford@FlightSafety.com> | 2008-01-30 21:49:59 +0300 |
|---|---|---|
| committer | Brian Ford <Brian.Ford@FlightSafety.com> | 2008-01-30 21:49:59 +0300 |
| commit | 17bccd41201d7d6edc758a80f0c503a41c46dd29 (patch) | |
| tree | 7c7725aa6a0ffded65ef3351f2f63adbb71a223f | |
| parent | f022e6b98eac71a3fea282fdb928668e5e6d0a64 (diff) | |
Remove conflict marker as obvious.
| -rw-r--r-- | newlib/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 551d7a530..8501c00b5 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -42,7 +42,6 @@ (CHEWOUT_FILES): Build documentation for memmem. * libc/string/strings.tex: Include new docs. ->>>>>>> 1.1116 2008-01-08 Jeff Johnston <jjohnstn@redhat.com> * libc/machine/m68k/memcpy.S: Remove % from register references |