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

diff --git a/man/conflict.man b/man/conflict.man
index 6cc6944..fc9cc99 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