Merge pull request #12838 from omoerbeek/delint-rec-tcp

author Otto Moerbeek <otto.moerbeek@open-xchange.com>

Tue, 30 May 2023 13:03:58 +0000 (15:03 +0200)

committer GitHub <noreply@github.com>

Tue, 30 May 2023 13:03:58 +0000 (15:03 +0200)
author Otto Moerbeek <otto.moerbeek@open-xchange.com>
Tue, 30 May 2023 13:03:58 +0000 (15:03 +0200)
committer GitHub <noreply@github.com>
Tue, 30 May 2023 13:03:58 +0000 (15:03 +0200)
diff --cc pdns/recursordist/rec-main.hh
Simple merge
diff --cc pdns/recursordist/syncres.hh
Simple merge
author	Otto Moerbeek <otto.moerbeek@open-xchange.com>
	Tue, 30 May 2023 13:03:58 +0000 (15:03 +0200)
committer	GitHub <noreply@github.com>
	Tue, 30 May 2023 13:03:58 +0000 (15:03 +0200)
		1	2
pdns/recursordist/rec-main.hh	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/recursordist/syncres.hh	patch \|	diff1 \|	diff2 \|	blob \| history