From: Nicko Dehaine <nicko@threatstop.com>
Date: Tue, 18 Aug 2020 22:44:19 +0000 (+0000)
Subject: Fix rebase conflict
X-Git-Tag: rec-4.4.0-beta1~4^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95fc0fc440ca17efc9728e415a9b03556ba17e38;p=thirdparty%2Fpdns.git

Fix rebase conflict
---

diff --git a/docs/appendices/types.rst b/docs/appendices/types.rst
index ee05bf2b53..74e947e9f4 100644
--- a/docs/appendices/types.rst
+++ b/docs/appendices/types.rst
@@ -79,17 +79,6 @@ to specify a DNS RR type "APL" for address prefix lists.
 
 .. _types-apl:
 
-APL
------
-
-.. versionadded:: tbd
-
-The APL record,
-specified in :rfc:`3123`, is used
-to specify a DNS RR type "APL" for address prefix lists.
-
-.. _types-apl:
-
 CAA
 ---