diff options
| author | darrenr <darrenr@FreeBSD.org> | 2000-08-13 04:31:06 +0000 |
|---|---|---|
| committer | darrenr <darrenr@FreeBSD.org> | 2000-08-13 04:31:06 +0000 |
| commit | 24d61c1ea6524a1b7910f56be8efa8856dc8def0 (patch) | |
| tree | 93a3df605afd9999f0dbab48bc27492ac19c8a02 /sys/netinet/ip_log.c | |
| parent | 8c08c8f2561bed1192e70cf4fc45e37370e1905a (diff) | |
| download | FreeBSD-src-24d61c1ea6524a1b7910f56be8efa8856dc8def0.zip FreeBSD-src-24d61c1ea6524a1b7910f56be8efa8856dc8def0.tar.gz | |
resolve conflicts
Diffstat (limited to 'sys/netinet/ip_log.c')
| -rw-r--r-- | sys/netinet/ip_log.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sys/netinet/ip_log.c b/sys/netinet/ip_log.c index 9178c74..082a0a3 100644 --- a/sys/netinet/ip_log.c +++ b/sys/netinet/ip_log.c @@ -27,8 +27,6 @@ # endif # else # ifdef KLD_MODULE -# include <sys/osreldate.h> -# else # include <osreldate.h> # endif # endif |
