summaryrefslogtreecommitdiff
path: root/man/dnsmasq.8
diff options
context:
space:
mode:
authorSimon Kelley <simon@thekelleys.org.uk>2021-04-14 01:00:48 +0100
committerSimon Kelley <simon@thekelleys.org.uk>2021-04-14 01:00:48 +0100
commitffd3ceb856eb3e1ff923cae95a2ddb889beab7c1 (patch)
treea33741724536e5a927a96a4582c3c16f617715ac /man/dnsmasq.8
parentd942aa9321d27981efe13bc56bc231de5631253a (diff)
downloaddnsmasq-ffd3ceb856eb3e1ff923cae95a2ddb889beab7c1.tar.gz
Remove old patch droppings in manpage.
Diffstat (limited to 'man/dnsmasq.8')
-rw-r--r--man/dnsmasq.81
1 files changed, 0 insertions, 1 deletions
diff --git a/man/dnsmasq.8 b/man/dnsmasq.8
index eec77af..bcbc402 100644
--- a/man/dnsmasq.8
+++ b/man/dnsmasq.8
@@ -1523,7 +1523,6 @@ instance
will enable dnsmasq to also provide proxy PXE service to those PXE clients with
.I HW-Client
in as their identifier.
->>>>>>> 907def3... pxe: support pxe clients with custom vendor-class
.TP
.B \-X, --dhcp-lease-max=<number>
Limits dnsmasq to the specified maximum number of DHCP leases. The