JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove conflict marker as obvious.

This commit is contained in:
Brian Ford 2008-01-30 18:49:59 +00:00
parent f022e6b98e
commit 17bccd4120
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
newlib/ChangeLog
View File

@ -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