X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=man%2Fconflict.man;h=e41d260f6b4477de6f121e2e02cb686f546955a0;hb=dc32dd097ee3b21bb802d9f6290fb4c9299b4ee1;hp=f6905960201de219d06440289bb1c00697e530d6;hpb=5dd6771b28c257af405d7248639ed0e3bcdce38b;p=mmh

diff --git a/man/conflict.man b/man/conflict.man
index f690596..e41d260 100644
--- a/man/conflict.man
+++ b/man/conflict.man
@@ -17,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