X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=man%2Fconflict.man;h=e41d260f6b4477de6f121e2e02cb686f546955a0;hb=9f8f8b1e1d553774865f2c177191c359c3dc652c;hp=6cc694423ea591de8923c9b0eadc11321c5c0a86;hpb=1b5a1bd2244d3e1c12b7c9e1f48e445de5ad2ea2;p=mmh

diff --git a/man/conflict.man b/man/conflict.man
index 6cc6944..e41d260 100644
--- a/man/conflict.man
+++ b/man/conflict.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH CONFLICT %manext8% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
@@ -18,6 +17,8 @@ conflict \- search for alias/password conflicts
 .RI [ aliasfiles
 \&...]
 .ad
+.SH STATUS
+.B Conflict is deprecated and will be removed from the next nmh release.
 .SH DESCRIPTION
 .B Conflict
 is a program that checks to see if the interface between