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

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