diff options
author | sthen <sthen@openbsd.org> | 2012-07-09 21:56:41 +0000 |
---|---|---|
committer | sthen <sthen@openbsd.org> | 2012-07-09 21:56:41 +0000 |
commit | d11a62c800a9736889df9db56be3ec9ec3262d3b (patch) | |
tree | af938ad5ab52a364f66f3bce2aa42413976ec357 /usr.sbin/nsd/xfrd-tcp.c | |
parent | NSD v3.2.11, ok phessler@ (diff) | |
download | wireguard-openbsd-d11a62c800a9736889df9db56be3ec9ec3262d3b.tar.xz wireguard-openbsd-d11a62c800a9736889df9db56be3ec9ec3262d3b.zip |
resolve conflicts
Diffstat (limited to 'usr.sbin/nsd/xfrd-tcp.c')
-rw-r--r-- | usr.sbin/nsd/xfrd-tcp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/nsd/xfrd-tcp.c b/usr.sbin/nsd/xfrd-tcp.c index 9f479e8f4f1..0f09e447368 100644 --- a/usr.sbin/nsd/xfrd-tcp.c +++ b/usr.sbin/nsd/xfrd-tcp.c @@ -7,7 +7,7 @@ * */ -#include <config.h> +#include "config.h" #include <assert.h> #include <errno.h> #include <fcntl.h> |