OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed conflict marker.

This commit is contained in:
Andreas Jaeger 2000-05-07 14:13:21 +00:00
parent f0a7f7424f
commit aa5f4ad8ef
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1373,7 +1373,6 @@
* sysdeps/mips/dl-machine.h: Update some comments.
(ELF_MACHINE_ALIGN_MASK): Removed, it's not needed.
>>>>>>> 1.3514
2000-04-11 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/bits/posix_opt.h: Add