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

diff --git a/man/conflict.man b/man/conflict.man
index 6cc6944..fc2f8d7 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
@@ -14,7 +13,7 @@ conflict \- search for alias/password conflicts
 .RB [ \-mail
 .IR name ]
 .RB [ \-version ]
-.RB [ \-help ] 
+.RB [ \-help ]
 .RI [ aliasfiles
 \&...]
 .ad
@@ -77,9 +76,7 @@ None
 mh\-alias(5)
 
 .SH "DEFAULTS"
-.nf
-.RB ` aliasfiles "' defaults to %etcdir%/MailAliases"
-.fi
+None
 
 .SH CONTEXT
 None