diff options
| author | Thomas Adam <thomas@xteddy.org> | 2016-10-13 08:09:47 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2016-10-13 08:09:47 +0100 |
| commit | 6551f4bb3b651aa2dba77a98cc42828737b88306 (patch) | |
| tree | 82dd6cbba583e9d4bc58a9334a8b74713d94da89 /paste.c | |
| parent | 76a9e6f27bb0c7b547989c3b80cf8cc0a148064d (diff) | |
| parent | e0add119ea4a6c8d40905a7ad1f7bc3553d20ccc (diff) | |
Merge branch 'obsd-master'
Conflicts:
paste.c
Diffstat (limited to 'paste.c')
| -rw-r--r-- | paste.c | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -17,7 +17,6 @@ */ #include <sys/types.h> -#include <sys/time.h> #include <stdlib.h> #include <string.h> |