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~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d23da59d7263ef8b6b0ed9cb7305eb2356c068e7;p=thirdparty%2Fpdns.git

Fix rebase conflict
---

diff --git a/docs/appendices/types.rst b/docs/appendices/types.rst
index 68e62bcc6a..c641c20adb 100644
--- a/docs/appendices/types.rst
+++ b/docs/appendices/types.rst
@@ -68,17 +68,6 @@ to specify a DNS RR type "APL" for address prefix lists.
 
 .. _types-caa:
 
-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
 ---