diff options
| author |   espie <espie@openbsd.org> | 2003-11-25 21:06:18 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2003-11-25 21:06:18 +0000 |
| commit | 37c533223a617425b64bf716c3068c3739b7224b (patch) | |
| tree | a212572d65681c0339e1897015d21c35c6fb0af3 /sys/compat/linux/linux_socket.c | |
| parent | Synch with gcc-3.3.2 version (diff) | |
| download | wireguard-openbsd-37c533223a617425b64bf716c3068c3739b7224b.tar.xz wireguard-openbsd-37c533223a617425b64bf716c3068c3739b7224b.zip | |
fix stupid cvs conflicts.
I think that cvs is a poor lonesome, depressive program.
The only way it has found of getting your attention is to throw
senseless conflicts that shouldn't exist in your way.
Diffstat (limited to 'sys/compat/linux/linux_socket.c')
0 files changed, 0 insertions, 0 deletions