X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/d4850ff231bec8513dcd106bdb93bc61d179d8f6..b14a242ba7e1d22e67b2151b4a4aff095f554050:/docs/pending-release-notes

diff --git a/docs/pending-release-notes b/docs/pending-release-notes
index 33730ba1..38a3f7ab 100644
--- a/docs/pending-release-notes
+++ b/docs/pending-release-notes
@@ -32,3 +32,4 @@ OBSOLETE/DEPRECATED FEATURES
   and will be removed in the next release.  It supports the
   SMTP XQUE verb, which is obsolete according to
   http://smtpfilter.sourceforge.net/esmtp.html
+- conflict(8) is deprecated and will be removed from the next release.