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

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