From ffd3ceb856eb3e1ff923cae95a2ddb889beab7c1 Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@thekelleys.org.uk>
Date: Wed, 14 Apr 2021 01:00:48 +0100
Subject: [PATCH] Remove old patch droppings in manpage.

---
 man/dnsmasq.8 | 1 -
 1 file changed, 1 deletion(-)

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